Merge branch 'image-push' into tags-combo-approach

MukuFlash03 · May 6, 2024 · 43adc05 · 43adc05
2 parents 629831f + ab51504
commit 43adc05
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,6 @@
-# TODO: Please change once all PR changes are final, so it reads from shankari/e-mission-server
-# FROM shankari/e-mission-server:master_2024-02-10--19-38
 ARG DOCKER_IMAGE_TAG
-FROM mukuflash03/e-mission-server:tags-combo-approach_${DOCKER_IMAGE_TAG}
+
+FROM shankari/e-mission-server:master_${DOCKER_IMAGE_TAG}
 
 ENV DASH_DEBUG_MODE True
 ENV SERVER_PORT 8050

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,7 +1,6 @@
-# TODO: Please change once all PR changes are final, so it reads from shankari/e-mission-server
-# FROM shankari/e-mission-server:master_2024-02-10--19-38
 ARG DOCKER_IMAGE_TAG
-FROM mukuflash03/e-mission-server:tags-combo-approach_${DOCKER_IMAGE_TAG}
+
+FROM shankari/e-mission-server:master_${DOCKER_IMAGE_TAG}
 
 ENV DASH_DEBUG_MODE True
 ENV SERVER_PORT 8050