build: upgrade ODK Central --> 2024.1.0 + minio and nginx

hotosm · Jun 6, 2024 · aa4a0e8 · aa4a0e8
1 parent 04b77f5
commit aa4a0e8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -114,7 +114,7 @@ s3:
   replicas: 1
   image:
     repository: quay.io/minio/minio
-    tag: RELEASE.2024-01-01T16-36-33Z
+    tag: RELEASE.2024-06-06T09-36-42Z
   environment:
     MINIO_BROWSER: "off"
   mountPath: /mnt/data

diff --git a/docker-compose.development.yml b/docker-compose.development.yml
@@ -120,7 +120,7 @@ services:
     restart: "on-failure:2"
 
   central:
-    image: "ghcr.io/hotosm/fmtm/odkcentral:${ODK_CENTRAL_TAG:-v2023.5.0}"
+    image: "ghcr.io/hotosm/fmtm/odkcentral:${ODK_CENTRAL_TAG:-v2024.1.0}"
     depends_on:
       central-db:
         condition: service_healthy
@@ -162,14 +162,14 @@ services:
   central-ui:
     # This service simply builds the frontend to a volume
     # accessible to the proxy, then shuts down
-    image: "ghcr.io/hotosm/fmtm/odkcentral-ui:${ODK_CENTRAL_TAG:-v2023.5.0}"
+    image: "ghcr.io/hotosm/fmtm/odkcentral-ui:${ODK_CENTRAL_TAG:-v2024.1.0}"
     volumes:
       - central_frontend:/frontend
     network_mode: none
     restart: "on-failure:2"
 
   s3:
-    image: "docker.io/minio/minio:${MINIO_TAG:-RELEASE.2024-01-01T16-36-33Z}"
+    image: "docker.io/minio/minio:${MINIO_TAG:-RELEASE.2024-06-06T09-36-42Z}"
     environment:
       MINIO_ROOT_USER: ${S3_ACCESS_KEY}
       MINIO_ROOT_PASSWORD: ${S3_SECRET_KEY}

diff --git a/docker-compose.main.yml b/docker-compose.main.yml
@@ -110,7 +110,7 @@ services:
     restart: "on-failure:2"
 
   s3:
-    image: "docker.io/minio/minio:${MINIO_TAG:-RELEASE.2024-01-01T16-36-33Z}"
+    image: "docker.io/minio/minio:${MINIO_TAG:-RELEASE.2024-06-06T09-36-42Z}"
     environment:
       MINIO_ROOT_USER: ${S3_ACCESS_KEY}
       MINIO_ROOT_PASSWORD: ${S3_SECRET_KEY}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -37,7 +37,7 @@ services:
       context: nginx
       target: debug
       args:
-        NGINX_TAG: "${NGINX_TAG:-1.25.3}"
+        NGINX_TAG: "${NGINX_TAG:-1.27.0}"
     depends_on:
       api:
         condition: service_started
@@ -143,11 +143,11 @@ services:
 
   central:
     profiles: ["", "central"]
-    image: "ghcr.io/hotosm/fmtm/odkcentral:${ODK_CENTRAL_TAG:-v2023.5.0}"
+    image: "ghcr.io/hotosm/fmtm/odkcentral:${ODK_CENTRAL_TAG:-v2024.1.0}"
     build:
       context: odkcentral/api
       args:
-        ODK_CENTRAL_TAG: ${ODK_CENTRAL_TAG:-v2023.5.0}
+        ODK_CENTRAL_TAG: ${ODK_CENTRAL_TAG:-v2024.1.0}
     depends_on:
       central-db:
         condition: service_healthy
@@ -195,18 +195,18 @@ services:
     # This service simply builds the frontend to a volume
     # accessible to the proxy, then shuts down
     profiles: ["", "central"]
-    image: "ghcr.io/hotosm/fmtm/odkcentral-ui:${ODK_CENTRAL_TAG:-v2023.5.0}"
+    image: "ghcr.io/hotosm/fmtm/odkcentral-ui:${ODK_CENTRAL_TAG:-v2024.1.0}"
     build:
       context: odkcentral/ui
       args:
-        ODK_CENTRAL_TAG: ${ODK_CENTRAL_TAG:-v2023.5.0}
+        ODK_CENTRAL_TAG: ${ODK_CENTRAL_TAG:-v2024.1.0}
     volumes:
       - central_frontend:/frontend
     network_mode: none
     restart: "on-failure:2"
 
   s3:
-    image: "docker.io/minio/minio:${MINIO_TAG:-RELEASE.2024-01-01T16-36-33Z}"
+    image: "docker.io/minio/minio:${MINIO_TAG:-RELEASE.2024-06-06T09-36-42Z}"
     environment:
       MINIO_ROOT_USER: ${S3_ACCESS_KEY:-fmtm}
       MINIO_ROOT_PASSWORD: ${S3_SECRET_KEY:-somelongpassword}

diff --git a/nginx/build_imgs.sh b/nginx/build_imgs.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-NGINX_TAG="${NGINX_TAG:-1.25.3}"
+NGINX_TAG="${NGINX_TAG:-1.27.0}"
 
 # Dev certs init
 echo "Building proxy:certs-init-development"

diff --git a/src/backend/Dockerfile b/src/backend/Dockerfile
@@ -15,7 +15,7 @@
 #     along with FMTM.  If not, see <https:#www.gnu.org/licenses/>.
 #
 ARG PYTHON_IMG_TAG=3.10
-ARG MINIO_TAG=${MINIO_TAG:-RELEASE.2024-01-01T16-36-33Z}
+ARG MINIO_TAG=${MINIO_TAG:-RELEASE.2024-06-06T09-36-42Z}
 FROM docker.io/minio/minio:${MINIO_TAG} as minio