Align nginx tag value driven by .env variable (#4623)

GeoNode · Jul 10, 2019 · adebc2e · adebc2e
1 parent 31a8d48
commit adebc2e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docker-compose.async.yml b/docker-compose.async.yml
@@ -100,7 +100,7 @@ services:
       - ./scripts/docker/env/${SET_DOCKER_ENV}/django.env
 
   geonode:
-    image: geonode/nginx:geoserver
+    image: geonode/nginx:${SET_DOCKER_ENV}
     restart: unless-stopped
     container_name: nginx4${COMPOSE_PROJECT_NAME}
     stdin_open: true

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -54,7 +54,7 @@ services:
       - ./scripts/docker/env/${SET_DOCKER_ENV}/django.env
 
   geonode:
-    image: geonode/nginx:geoserver
+    image: geonode/nginx:${SET_DOCKER_ENV}
     restart: unless-stopped
     container_name: nginx4${COMPOSE_PROJECT_NAME}
     stdin_open: true

diff --git a/docs/install/core/index.rst b/docs/install/core/index.rst
@@ -1294,7 +1294,7 @@ It is possible to let docker show which containers are currently running (add ``
   docker ps
 
   CONTAINER ID        IMAGE                      COMMAND                  CREATED             STATUS              PORTS                NAMES
-  3b232931f820        geonode/nginx:geoserver    "nginx -g 'daemon of…"   26 minutes ago      Up 26 minutes       0.0.0.0:80->80/tcp   nginx4geonode
+  3b232931f820        geonode/nginx:production    "nginx -g 'daemon of…"   26 minutes ago      Up 26 minutes       0.0.0.0:80->80/tcp   nginx4geonode
   ff7002ae6e91        geonode/geonode:latest     "/usr/src/app/entryp…"   26 minutes ago      Up 26 minutes       8000/tcp             django4geonode
   2f155e5043be        geonode/geoserver:2.14.3   "/usr/local/tomcat/t…"   26 minutes ago      Up 26 minutes       8080/tcp             geoserver4geonode
   97f1668a01b1        geonode_celery             "/usr/src/app/entryp…"   26 minutes ago      Up 26 minutes       8000/tcp             geonode_celery_1