Provide ENV variables for frontned image

Author: MiklerGM

.github/workflows/ci-cd.yml

@@ -10,6 +10,7 @@ jobs:
           mv django.env.sample django.env &&
           mv postgres.env.sample postgres.env &&
           mv mbtiles.env.sample mbtiles.env &&
+          mv frontend.env.sample frontend.env &&
           touch auth.env
       - env:
           SERVICE_KEY_BASE64: ${{ secrets.SERVICE_KEY_BASE64 }}

.github/workflows/python-image.yml

@@ -0,0 +1,17 @@
+name: Python Image
+on: workflow_dispatch
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      # build
+      - uses: actions/checkout@v3
+      - run: make python-image
+      # deploy
+      - name: Docker Hub login
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Docker push
+        run: make push-python

.github/workflows/system-image.yml

@@ -6,14 +6,6 @@ jobs:
     steps:
       # build
       - uses: actions/checkout@v3
-      - run: >
-          mv django.env.sample django.env &&
-          mv postgres.env.sample postgres.env &&
-          mv mbtiles.env.sample mbtiles.env &&
-          touch auth.env
-      - env:
-          SERVICE_KEY_BASE64: ${{ secrets.SERVICE_KEY_BASE64 }}
-        run: echo "${SERVICE_KEY_BASE64// /}" | base64 --decode > config/firebase.json
       - run: make system-image
       # deploy
       - name: Docker Hub login

docker-compose.yml

@@ -57,6 +57,9 @@ services:
     depends_on:
       - nginx
     image: chronmaps/frontend:release-prod
+    env_file:
+      - frontend.env
+
   celery:
     depends_on:
       - redis

docker/Dockerfile

@@ -1,7 +1,5 @@
 FROM chronmaps/backend:deps-python as python
 
-LABEL maintainer="Mikhail Orlov <miklergm@gmail.com>"
-
 RUN mkdir /config /src
 
 COPY ./project /src

docker/Dockerfile.base

@@ -1,8 +1,6 @@
 FROM python:3.9.10-alpine3.15 as base
 # chronmaps/backend:deps-base
 
-LABEL maintainer="Mikhail Orlov <miklergm@gmail.com>"
-
 ENV PYTHONUNBUFFERED=1 \
   PYTHONDONTWRITEBYTECODE=1 \
   PYTHONFAULTHANDLER=1 \

docker/Dockerfile.build

@@ -1,8 +1,6 @@
 FROM chronmaps/backend:deps-base as base
 # chronmaps/backend:deps-build
 
-LABEL maintainer="Mikhail Orlov <miklergm@gmail.com>"
-
 RUN set -ex \
     && apk add --no-cache \
       postgresql-dev linux-headers pcre-dev gcc musl-dev libffi-dev alpine-sdk libressl zlib-dev jpeg-dev \

docker/Dockerfile.python

@@ -1,19 +1,10 @@
 FROM chronmaps/backend:deps-build as build
 # chronmaps/backend:deps-python
 
-LABEL maintainer="Mikhail Orlov <miklergm@gmail.com>"
-
 RUN pip install "poetry==$POETRY_VERSION" 
 
 WORKDIR $PYSETUP_PATH
 COPY pyproject.toml poetry.lock ./
 RUN poetry install
 
-# TODO: create dev stage that runs linting etc, --no-dev in production
-
-FROM chronmaps/backend:deps-base as prod 
-
-COPY --from=build $VENV_PATH $VENV_PATH
-COPY --from=build $PYSETUP_PATH/pyproject.toml $PYSETUP_PATH/poetry.lock ./
-
 ENTRYPOINT /bin/sh

frontend.env.sample

@@ -0,0 +1,4 @@
+FLAGS_CONFIG_BASE64="e30K"
+ANALYTICS_CONFIG_BASE64="eyAieW0iOiAiIiwgImdhIjogIiIgfQo="
+MAPBOX_CONFIG_BASE64=""
+FIREBASE_CONFIG_BASE64=""