Refactor versioning

Using base images from upstream. Closes #32
Thuenen-GeoNode-Development · Aug 7, 2024 · 9053bb4 · 9053bb4
1 parent 92d4d84
commit 9053bb4
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 14 deletions.
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -36,7 +36,7 @@ services:
       context: ./.devcontainer/docker/geoserver
       dockerfile: Dockerfile
       args:
-        - BASE_IMAGE_VERSION=${GEONODE_VERSION}
+        - BASE_IMAGE_VERSION=${GEOSERVER_BASE_IMAGE_VERSION}
     environment:
       - OAUTH2_CLIENT_ID=${OAUTH2_CLIENT_ID}
       - OAUTH2_CLIENT_SECRET=${OAUTH2_CLIENT_SECRET}

diff --git a/.devcontainer/docker/geoserver/Dockerfile b/.devcontainer/docker/geoserver/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASE_IMAGE_VERSION
-FROM 52north/geonode-geoserver:${BASE_IMAGE_VERSION}
+FROM geonode/geoserver:${BASE_IMAGE_VERSION}
 
 ENV GEOSERVER_DATA_DIR="/geoserver_data/data"
 

diff --git a/.devcontainer/docker/postgresql/Dockerfile b/.devcontainer/docker/postgresql/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASE_IMAGE_VERSION
-FROM 52north/geonode-postgis:${BASE_IMAGE_VERSION}
+FROM geonode/postgis:${BASE_IMAGE_VERSION}
 
 COPY ./prepare-testdb.sh /docker-entrypoint-initdb.d/prepare-testdb.sh
 RUN chmod +x /docker-entrypoint-initdb.d/prepare-testdb.sh
diff --git a/.env.sample b/.env.sample
@@ -4,7 +4,11 @@ COMPOSE_PROJECT_NAME=geonode
 DOCKER_REGISTRY=
 # (optional) with trailing slash e.g. sample/ or orga/
 DOCKER_REPOSITORY=thuenen-atlas/
-GEONODE_VERSION="4.2.3"
+GEONODE_BASE_IMAGE_VERSION="4.x"
+NGINX_BASE_IMAGE_VERSION="1.25.3-latest"
+GEOSERVER_BASE_IMAGE_VERSION="2.24.2-latest"
+GEOSERVER_DATA_BASE_IMAGE_VERSION="2.24.2-latest"
+POSTGRES_BASE_IMAGE_VERSION="15.3-latest"
 PROJECT_VERSION="2.0"
 
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,12 +3,12 @@ version: '3.4'
 # Common Django template for GeoNode and Celery services below
 x-common-django:
   &default-common-django
-  image: ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}${COMPOSE_PROJECT_NAME}_django:${GEONODE_VERSION}-${PROJECT_VERSION}
+  image: ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}${COMPOSE_PROJECT_NAME}_django:${GEONODE_BASE_IMAGE_VERSION}-${PROJECT_VERSION}
   build:
     context: ./docker/geonode
     dockerfile: Dockerfile
     args:
-      - BASE_IMAGE_VERSION=${GEONODE_VERSION}
+      - BASE_IMAGE_VERSION=${GEONODE_BASE_IMAGE_VERSION}
   restart: no
   env_file:
     - .env
@@ -73,7 +73,7 @@ services:
       context: ./docker/nginx
       dockerfile: Dockerfile
       args:
-        - BASE_IMAGE_VERSION=${GEONODE_VERSION}
+        - BASE_IMAGE_VERSION=${NGINX_BASE_IMAGE_VERSION}
     container_name: nginx4${COMPOSE_PROJECT_NAME}
     env_file: ./.env
     environment:
@@ -102,7 +102,7 @@ services:
       context: ./docker/geoserver
       dockerfile: Dockerfile
       args:
-        - BASE_IMAGE_VERSION=${GEONODE_VERSION}
+        - BASE_IMAGE_VERSION=${GEOSERVER_BASE_IMAGE_VERSION}
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     env_file: ./.env
     healthcheck:
@@ -131,7 +131,7 @@ services:
       context: ./docker/geoserver_data
       dockerfile: Dockerfile
       args:
-        - BASE_IMAGE_VERSION=${GEONODE_VERSION}
+        - BASE_IMAGE_VERSION=${GEOSERVER_DATA_BASE_IMAGE_VERSION}
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     entrypoint: sleep infinity
     volumes:
@@ -148,7 +148,7 @@ services:
       context: ./docker/postgresql
       dockerfile: Dockerfile
       args:
-        - BASE_IMAGE_VERSION=${GEONODE_VERSION}
+        - BASE_IMAGE_VERSION=${POSTGRES_BASE_IMAGE_VERSION}
     command: postgres -c "max_connections=${POSTGRES_MAX_CONNECTIONS}"
     container_name: db4${COMPOSE_PROJECT_NAME}
     env_file: ./.env

diff --git a/docker/geoserver/Dockerfile b/docker/geoserver/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASE_IMAGE_VERSION
-FROM 52north/geonode-geoserver:${BASE_IMAGE_VERSION}
+FROM geonode/geoserver:${BASE_IMAGE_VERSION}
 
 ## GeoServer plugins
 #

diff --git a/docker/geoserver_data/Dockerfile b/docker/geoserver_data/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASE_IMAGE_VERSION
-FROM 52north/geonode-geoserver_data:${BASE_IMAGE_VERSION}
+FROM geonode/geoserver_data:${BASE_IMAGE_VERSION}
 
 # configure logging
 RUN sed 's|<stdOutLogging>false</stdOutLogging>|<stdOutLogging>true</stdOutLogging>|' -i "/geoserver_data/data/logging.xml"
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASE_IMAGE_VERSION
-FROM 52north/geonode-nginx:${BASE_IMAGE_VERSION}
+FROM geonode/nginx:${BASE_IMAGE_VERSION}
 
 COPY ./cert.pem /geonode-certificates/autoissued/fullchain.pem
 COPY ./key.pem /geonode-certificates/autoissued/privkey.pem

diff --git a/docker/postgresql/Dockerfile b/docker/postgresql/Dockerfile
@@ -1,2 +1,2 @@
 ARG BASE_IMAGE_VERSION
-FROM 52north/geonode-postgis:${BASE_IMAGE_VERSION}
+FROM geonode/postgis:${BASE_IMAGE_VERSION}