Merge pull request #363 from openml/feature/use-single-docker-image-for-all-environments

Feature/use single docker image for all environments

Author: josvandervelde

.env

@@ -16,15 +16,14 @@ TESTING=True
 
 URL_API=http://localhost:8000/api/
 
+
 # REACT
-# React env variables are fixed when building the app.
+# React env variables are fixed when building the app - but overwritten when setting up the docker container.
+# See docker/entrypoint.sh
 # React env variables need to be prefixed with "REACT_APP", otherwise the variables are ignored for
 # security reasons.
-REACT_APP_URL_SITE_BACKEND=http://localhost:8000/
-REACT_APP_URL_API=http://localhost:8000/api/
-REACT_APP_URL_ELASTICSEARCH=http://localhost:8000/es/
-REACT_APP_ELASTICSEARCH_VERSION_MAYOR=6
-REACT_APP_URL_MINIO=http://localhost:8000/data/
-FLASK_APP=autoapp.py
-FLASK_ENV=development
-DATABASE_URI=sqlite:///openml.db
+REACT_APP_URL_SITE_BACKEND=<REACT_APP_URL_SITE_BACKEND>
+REACT_APP_URL_API=<REACT_APP_URL_API>
+REACT_APP_URL_ELASTICSEARCH=<REACT_APP_URL_ELASTICSEARCH>
+REACT_APP_ELASTICSEARCH_VERSION_MAYOR=<REACT_APP_ELASTICSEARCH_VERSION_MAYOR>
+REACT_APP_URL_MINIO=<REACT_APP_URL_MINIO>

.env.dev

@@ -39,7 +39,7 @@ jobs:
         with:
           images: "openml/frontend"
           tags: |
-            type=semver,pattern={{raw}},prefix=dev_
+            type=semver,pattern={{raw}}
 
       - name: Build and push
         id: docker_build

.env.k8s

@@ -3,8 +3,7 @@ ARG environment=.dev
 COPY ./ /app
 
 RUN npm install --prefix /app/server/src/client/app
-RUN /app/server/src/client/app/node_modules/.bin/env-cmd -f /app/.env${environment} npm run build --prefix /app/server/src/client/app
-
+RUN /app/server/src/client/app/node_modules/.bin/env-cmd -f /app/.env npm run build --prefix /app/server/src/client/app
 
 
 FROM python:3.11-slim-bookworm
@@ -17,7 +16,6 @@ WORKDIR /app
 RUN python -m pip install -r requirements.txt
 
 RUN useradd --create-home unprivileged-user
-USER unprivileged-user
 
 COPY --from=build /app/server/src/client/app/build /app/server/src/client/app/build
 

.env.test

@@ -1,3 +1,13 @@
 #!/bin/bash
 
+for FILENAME in /app/server/src/client/app/build/static/js/*.js; do
+	# We expect some paths/urls to contain '/' characters, so we use '*' instead
+	sed "s*<REACT_APP_URL_SITE_BACKEND>*${REACT_APP_URL_SITE_BACKEND:-http://localhost:8000/}*g" --in-place ${FILENAME}
+	sed "s*<REACT_APP_URL_API>*${REACT_APP_URL_API:-http://localhost:8000/api/}*g" --in-place ${FILENAME}
+	sed "s*<REACT_APP_URL_ELASTICSEARCH>*${REACT_APP_URL_ELASTICSEARCH:-http://localhost:8000/es/}*g" --in-place ${FILENAME}
+	sed "s*<REACT_APP_ELASTICSEARCH_VERSION_MAYOR>*${REACT_APP_ELASTICSEARCH_VERSION_MAYOR:-6}*g" --in-place ${FILENAME}
+	sed "s*<REACT_APP_URL_MINIO>*${REACT_APP_URL_MINIO:-http://localhost:8000/data/}*g" --in-place ${FILENAME}
+done
+
+sudo su unprivileged-user
 gunicorn -b 0.0.0.0:5000 autoapp:app --chdir /app