refactor(docker): cleanup docker compose file

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/ReforceXY/Dockerfile.reforcexy b/ReforceXY/Dockerfile.reforcexy
new file mode 100644 (file)
index 0000000..25c10a3
--- /dev/null
+++ b/ReforceXY/Dockerfile.reforcexy
@@ -0,0 +1,11 @@
+FROM freqtradeorg/freqtrade:stable_freqairl
+
+ARG optuna_version=4.5.0
+
+RUN pip install --user --no-cache-dir \
+    optuna==${optuna_version} \
+    optuna-dashboard
+
+LABEL org.opencontainers.image.source="freqai-strategies" \
+      org.opencontainers.image.title="freqtrade-reforcexy" \
+      maintainer="auto-generated"

diff --git a/ReforceXY/docker-compose.yml b/ReforceXY/docker-compose.yml
index 82862d90201c3a18fb85badf8ee37d15dc5bfb27..074e92ecfb090619b1b5abe496fbcbc2b60cadab 100644 (file)
--- a/ReforceXY/docker-compose.yml
+++ b/ReforceXY/docker-compose.yml
@@ -15,13 +15,9 @@ services:
     # Build step - only needed when additional dependencies are needed
     build:
       context: .
-      dockerfile_inline: |
-        FROM freqtradeorg/freqtrade:stable_freqairl
-
-        ARG optuna_version
-        RUN pip install --user --no-cache-dir optuna==$${optuna_version} optuna-dashboard
+      dockerfile: Dockerfile.reforcexy
       args:
-        - optuna_version=4.5.0
+        optuna_version: 4.5.0
     restart: unless-stopped
     container_name: freqtrade-ReforceXY
     environment:

diff --git a/quickadapter/Dockerfile.quickadapter b/quickadapter/Dockerfile.quickadapter
new file mode 100644 (file)
index 0000000..8d07858
--- /dev/null
+++ b/quickadapter/Dockerfile.quickadapter
@@ -0,0 +1,21 @@
+FROM freqtradeorg/freqtrade:stable_freqai
+
+ARG optuna_version=4.5.0
+ARG scikit_learn_extra_version=0.3.0
+ARG skimage_version=0.25.2
+
+USER root
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends build-essential \
+ && rm -rf /var/lib/apt/lists/*
+USER ftuser
+RUN pip install --user --no-cache-dir \
+    optuna==${optuna_version} \
+    optuna-integration==${optuna_version} \
+    optuna-dashboard \
+    scikit-learn-extra==${scikit_learn_extra_version} \
+    scikit-image==${skimage_version}
+
+LABEL org.opencontainers.image.source="freqai-strategies" \
+      org.opencontainers.image.title="freqtrade-quickadapter" \
+      maintainer="auto-generated"

diff --git a/quickadapter/docker-compose.yml b/quickadapter/docker-compose.yml
index c502f0534f25544f5c2e26fa538fa17304fba333..f3efde95b03a21b57214b3812645c6b27ec4c469 100644 (file)
--- a/quickadapter/docker-compose.yml
+++ b/quickadapter/docker-compose.yml
@@ -15,27 +15,11 @@ services:
     # Build step - only needed when additional dependencies are needed
     build:
       context: .
-      dockerfile_inline: |
-        FROM freqtradeorg/freqtrade:stable_freqai
-
-        ARG optuna_version
-        ARG scikit_learn_extra_version
-        ARG skimage_version
-        USER root
-        RUN apt-get update \
-         && apt-get install -y --no-install-recommends build-essential \
-         && rm -rf /var/lib/apt/lists/*
-        USER ftuser
-        RUN pip install --user --no-cache-dir \
-            optuna==$${optuna_version} \
-            optuna-integration==$${optuna_version} \
-            optuna-dashboard \
-            scikit-learn-extra==$${scikit_learn_extra_version} \
-            scikit-image==$${skimage_version}
+      dockerfile: Dockerfile.quickadapter
       args:
-        - optuna_version=4.5.0
-        - scikit_learn_extra_version=0.3.0
-        - skimage_version=0.25.2
+        optuna_version: 4.5.0
+        scikit_learn_extra_version: 0.3.0
+        skimage_version: 0.25.2
     restart: unless-stopped
     container_name: freqtrade-quickadapter
     environment: