Refactor Dockerfiles to use one arg for frontend and backend. For far…

…mOS#68

.env

@@ -12,3 +12,6 @@ NGINX_WORKER_CONNECTIONS=1024
 DOCKER_IMAGE_BACKEND=backend
 DOCKER_IMAGE_CELERYWORKER=celeryworker
 DOCKER_IMAGE_FRONTEND=frontend
+
+AGGREGATOR_OPEN_FARM_REGISTRATION=true
+AGGREGATOR_INVITE_FARM_REGISTRATION=true

backend/backend.dockerfile

@@ -2,6 +2,12 @@ FROM tiangolo/uvicorn-gunicorn-fastapi:python3.7
 
 RUN pip install celery~=4.3 passlib[bcrypt] tenacity requests emails "fastapi==0.47.1" "pydantic==1.4" uvicorn gunicorn pyjwt python-multipart email_validator jinja2 psycopg2-binary alembic SQLAlchemy "farmOS==0.1.5"
 
+# Load farm registration configuration.
+ARG OPEN_FARM_REGISTRATION
+ARG INVITE_FARM_REGISTRATION
+ENV AGGREGATOR_OPEN_FARM_REGISTRATION=${OPEN_FARM_REGISTRATION}
+ENV AGGREGATOR_INVITE_FARM_REGISTRATION=${INVITE_FARM_REGISTRATION}
+
 # For development, Jupyter remote kernel, Hydrogen
 # Using inside the container:
 # jupyter notebook --ip=0.0.0.0 --allow-root

backend/celeryworker.dockerfile

@@ -2,6 +2,12 @@ FROM python:3.7
 
 RUN pip install raven celery~=4.3 passlib[bcrypt] tenacity requests "fastapi==0.47.1" "pydantic==1.4" emails pyjwt email_validator jinja2 psycopg2-binary alembic SQLAlchemy "farmOS==0.1.5"
 
+# Load farm registration configuration.
+ARG OPEN_FARM_REGISTRATION
+ARG INVITE_FARM_REGISTRATION
+ENV AGGREGATOR_OPEN_FARM_REGISTRATION=${OPEN_FARM_REGISTRATION}
+ENV AGGREGATOR_INVITE_FARM_REGISTRATION=${INVITE_FARM_REGISTRATION}
+
 # For development, Jupyter remote kernel, Hydrogen
 # Using inside the container:
 # jupyter notebook --ip=0.0.0.0 --allow-root

backend/tests.dockerfile

@@ -2,6 +2,12 @@ FROM python:3.7
 
 RUN pip install requests pytest tenacity passlib[bcrypt] celery~=4.3 "fastapi==0.47.1" "pydantic==1.4" pyjwt psycopg2-binary SQLAlchemy "farmOS==0.1.5"
 
+# Load farm registration configuration.
+ARG OPEN_FARM_REGISTRATION
+ARG INVITE_FARM_REGISTRATION
+ENV AGGREGATOR_OPEN_FARM_REGISTRATION=${OPEN_FARM_REGISTRATION}
+ENV AGGREGATOR_INVITE_FARM_REGISTRATION=${INVITE_FARM_REGISTRATION}
+
 # For development, Jupyter remote kernel, Hydrogen
 # Using inside the container:
 # jupyter notebook --ip=0.0.0.0 --allow-root

docker-compose.dev.yml

@@ -6,6 +6,8 @@ services:
       dockerfile: backend.dockerfile
       args:
         env: dev
+        OPEN_FARM_REGISTRATION: ${AGGREGATOR_OPEN_FARM_REGISTRATION}
+        INVITE_FARM_REGISTRATION: ${AGGREGATOR_INVITE_FARM_REGISTRATION}
     command: /start-reload.sh
     environment:
       - 'JUPYTER=jupyter notebook --ip=0.0.0.0 --allow-root'
@@ -45,6 +47,8 @@ services:
       context: ./frontend
       args:
         FRONTEND_ENV: dev
+        OPEN_FARM_REGISTRATION: ${AGGREGATOR_OPEN_FARM_REGISTRATION}
+        INVITE_FARM_REGISTRATION: ${AGGREGATOR_INVITE_FARM_REGISTRATION}
     ports:
       - '5555:5555'
   proxy:

env-backend.env

@@ -14,6 +14,4 @@ USERS_OPEN_REGISTRATION=False
 
 SENTRY_DSN=
 
-AGGREGATOR_INVITE_FARM_REGISTRATION=true
-AGGREGATOR_OPEN_FARM_REGISTRATION=true
 FARM_ACTIVE_AFTER_REGISTRATION=true

frontend/.env

@@ -8,7 +8,3 @@ VUE_APP_NAME=farmOS-aggregator
 VUE_APP_ENV=development
 # VUE_APP_ENV=staging
 # VUE_APP_ENV=production
-
-# Configure how users can join the aggregator
-VUE_APP_OPEN_FARM_REGISTRATION=false
-VUE_APP_INVITE_FARM_REGISTRATION=false

frontend/.env.development

@@ -0,0 +1,14 @@
+VUE_APP_DOMAIN_DEV=localhost
+# VUE_APP_DOMAIN_DEV=local.dockertoolbox.tiangolo.com
+# VUE_APP_DOMAIN_DEV=localhost.tiangolo.com
+# VUE_APP_DOMAIN_DEV=dev.localhost
+VUE_APP_DOMAIN_STAG=stag.localhost
+VUE_APP_DOMAIN_PROD=localhost
+VUE_APP_NAME=farmOS-aggregator
+VUE_APP_ENV=development
+# VUE_APP_ENV=staging
+# VUE_APP_ENV=production
+
+# Add aggregator config vars for local development
+VUE_APP_OPEN_FARM_REGISTRATION=true
+VUE_APP_INVITE_FARM_REGISTRATION=true

frontend/Dockerfile

@@ -13,6 +13,12 @@ ARG FRONTEND_ENV=production
 
 ENV VUE_APP_ENV=${FRONTEND_ENV}
 
+# Load farm registration configuration.
+ARG OPEN_FARM_REGISTRATION
+ARG INVITE_FARM_REGISTRATION
+ENV VUE_APP_OPEN_FARM_REGISTRATION=${OPEN_FARM_REGISTRATION}
+ENV VUE_APP_INVITE_FARM_REGISTRATION=${INVITE_FARM_REGISTRATION}
+
 # Comment out the next line to disable tests
 RUN npm run test:unit