Make frontend docker config more configurable

.env.docker

@@ -9,3 +9,7 @@ DB_PORT=5432
 # PGADMIN admin user 
 [email protected]
 PGADMIN_PASSWORD=root
+
+# Frontend
+ESID_PORT=8080
+ESID_BRANCH=latest

backend/Dockerfile

@@ -9,14 +9,15 @@ ENV PYTHONUNBUFFERED 1
 RUN set -x && \
 	apt-get update && \
 	apt -f install	&& \
-	apt-get -qy install netcat && \
+	apt-get -qy install netcat-traditional && \
 	rm -rf /var/lib/apt/lists/* && \
 	wget -O /wait-for https://raw.githubusercontent.com/eficode/wait-for/master/wait-for && \
 	chmod +x /wait-for
 
 CMD ["sh", "/entrypoint-startup.sh"]
 COPY ./docker/entrypoint-startup.sh /
 
+COPY ./.env ./.env
 COPY ./requirements ./requirements
 
 RUN pip install numpy scipy pandas tqdm

docker-compose.yaml

@@ -47,7 +47,7 @@ services:
       - db
 
   frontend:
-    image: esid/frontend:latest
+    image: esid/frontend:${ESID_BRANCH}
     restart: always
     build:
       context: frontend/
@@ -56,7 +56,7 @@ services:
       PROXY_PORT: 8000
       HOST: ${HOST}
     ports:
-      - 8080:80
+      - ${ESID_PORT}:80
     depends_on:
       - backend
 

frontend/.env.docker

@@ -3,3 +3,6 @@ PROXY_HOST=http://localhost
 API_URL=
 
 HOST=localhost
+
+ESID_PORT=8080
+ESID_BRANCH=latest

frontend/Dockerfile

@@ -8,7 +8,7 @@ WORKDIR /app
 #copy all the folder contents from local to container
 COPY . .
 
-COPY ./.env.docker ./.env
+COPY ./.env ./.env
 
 #Run command npm install to install packages
 RUN npm ci

frontend/docker-compose.yml

@@ -1,14 +1,14 @@
-version: '3.9'
+version: '3.7'
 services:
   frontend:
     build:
       context: .
       dockerfile: Dockerfile
-    image: esid/frontend:latest
+    image: esid/frontend:${ESID_BRANCH}
     environment:
       HOST: ${HOST}
       API_URL: ${API_URL}
       PROXY_HOST: ${PROXY_HOST}
       PROXY_PORT: ${PROXY_PORT}
     ports:
-      - '8080:80'
+      - ${ESID_PORT}:80