Update handling of versions

fractal-analytics-platform · Oct 3, 2023 · c6a2de5 · c6a2de5
1 parent b17e255
commit c6a2de5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/config.env b/config.env
@@ -0,0 +1,14 @@
+
+# Client
+# FRACTAL_CLIENT_RELEASE=1.3.5
+# FRACTAL_CLIENT_GIT=
+
+# server
+FRACTAL_SERVER_RELEASE=1.3.5
+# FRACTAL_SERVER_GIT=
+
+# Tasks
+# FRACTAL_TASKS_CORE_RELEASE=2342
+
+# Web client
+# FRACTAL_WEB_GIT=1221
diff --git a/config_env.sh b/config_env.sh
diff --git a/server/Dockerfile.step2.server b/server/Dockerfile.step2.server
@@ -6,7 +6,7 @@ FROM fractal/server-base:1
 COPY server/server.env ./.fractal_server.env
 
 # Install fractal-server (behavior depends on some environment variables)
-COPY config_env.sh .
+COPY config.env .
 COPY server/install_fractal_server.sh .
 RUN bash install_fractal_server.sh
 

diff --git a/server/install_fractal_server.sh b/server/install_fractal_server.sh
@@ -1,7 +1,7 @@
-export $(grep -v '^#' config_env.sh | xargs)
-export FRACTAL_SERVER_RELEASE=asdasd
+# export $(grep -v '^#' config_env.sh | xargs)
+source config.env
 
 echo "FRACTAL_SERVER_RELEASE: $FRACTAL_SERVER_RELEASE"
 echo "FRACTAL_SERVER_GIT: $FRACTAL_SERVER_GIT"
 
-pip install fractal-server[postgres,gunicorn]==1.3.8a3
+pip install fractal-server[postgres,gunicorn]==$FRACTAL_SERVER_RELEASE