Merge branch '6.x' into build/DDS-1584

dpc-sdp · Jan 16, 2024 · 83334d1 · 83334d1
2 parents a779dbe + 7c79d34
commit 83334d1
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 15 deletions.
diff --git a/gh-actions-bake.hcl b/gh-actions-bake.hcl
@@ -60,7 +60,7 @@ target "php-cli" {
 
   labels = {
     "org.opencontainers.image.description" = "PHP Drupal CLI image for Bay container platform"
-    "org.opencontainers.image.source" = "https://github.com/dpc-sdp/bay/blob/5.x/images/bay-php/Dockerfile.cli"
+    "org.opencontainers.image.source" = "https://github.com/dpc-sdp/bay/blob/6.x/images/bay-php/Dockerfile.cli"
   }
 }
 target "php-fpm" {
@@ -72,7 +72,7 @@ target "php-fpm" {
 
   labels = {
     "org.opencontainers.image.description" = "PHP-FPM image for Bay container platform"
-    "org.opencontainers.image.source" = "https://github.com/dpc-sdp/bay/blob/5.x/images/bay-php/Dockerfile.fpm"
+    "org.opencontainers.image.source" = "https://github.com/dpc-sdp/bay/blob/6.x/images/bay-php/Dockerfile.fpm"
   }
 }
 target "ripple-static" {

diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml
@@ -21,7 +21,7 @@ additional_build_steps:
   prepend_final:
     - LABEL org.opencontainers.image.authors="Digital Victoria"
     - LABEL org.opencontainers.image.description="Provides an AWX execution environment image optimised for use with SDP."
-    - LABEL org.opencontainers.image.source="https://github.com/dpc-sdp/bay/blob/5.x/images/awx-ee/context/Dockerfile"
+    - LABEL org.opencontainers.image.source="https://github.com/dpc-sdp/bay/blob/6.x/images/awx-ee/context/Dockerfile"
     - ARG LAGOON_CLI_VERSION=v0.15.4
     - ARG NVM_INSTALL_VERSION=v0.39.1
     - ARG NODE_VERSION=v14.15.1
@@ -70,3 +70,7 @@ additional_build_steps:
     - RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/$NVM_INSTALL_VERSION/install.sh | bash
     - RUN curl -L "https://get.helm.sh/helm-v3.12.2-linux-amd64.tar.gz" -o /tmp/helm && tar -xvf /tmp/helm -C /tmp && mv /tmp/linux-amd64/helm /usr/local/bin
     - RUN chmod +x /usr/local/bin/helm
+    - RUN curl -L https://github.com/google/yamlfmt/releases/download/v0.10.0/yamlfmt_0.10.0_Linux_x86_64.tar.gz --output /tmp/yamlfmt_0.10.0_Linux_x86_64.tar.gz
+    - RUN tar -C /tmp -xvf /tmp/yamlfmt_0.10.0_Linux_x86_64.tar.gz
+    - RUN chmod +x /tmp/yamlfmt
+    - RUN mv /tmp/yamlfmt /usr/local/bin
diff --git a/images/bay-php_goss/Dockerfile b/images/bay-php_goss/Dockerfile
@@ -4,4 +4,4 @@
 
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
-LABEL org.opencontainers.image.source="https://github.com/dpc-sdp/bay/blob/5.x/images/bay-php_goss/Dockerfile"
+LABEL org.opencontainers.image.source="https://github.com/dpc-sdp/bay/blob/6.x/images/bay-php_goss/Dockerfile"
diff --git a/images/bay-test/Dockerfile b/images/bay-test/Dockerfile
@@ -1,2 +1,2 @@
 FROM uselagoon/php-7.4-cli-drupal:latest
-LABEL org.opencontainers.image.source="https://github.com/dpc-sdp/bay/blob/5.x/images/bay-test/Dockerfile"
+LABEL org.opencontainers.image.source="https://github.com/dpc-sdp/bay/blob/6.x/images/bay-test/Dockerfile"
diff --git a/images/mailhog/README.md b/images/mailhog/README.md
@@ -13,7 +13,7 @@ You can also use it in your Docker Compose stack with the following snippet:
 ```
 services:
   mailhog:
-    image: singledigital/bay-mailhog:5.x
+    image: singledigital/bay-mailhog:6.x
     ports:
       - 1025
       - 8025

diff --git a/images/nginx/README.md b/images/nginx/README.md
@@ -18,7 +18,7 @@ You can also use it in your Docker Compose stack with the following snippet:
 ```
 services:
   nginx:
-    image: singledigital/bay-nginx:5.x
+    image: singledigital/bay-nginx:6.x
     volumes: 
       - path/to/app:/app
     ports:

diff --git a/images/node/README.md b/images/node/README.md
@@ -14,7 +14,7 @@ You can also use it in your Docker Compose stack with the following snippet:
 ```
 services:
   app:
-    image: singledigital/bay-node:5.x
+    image: singledigital/bay-node:6.x
     volumes:
       - path/to/app:/app
     ports:

diff --git a/images/php/Dockerfile.cli b/images/php/Dockerfile.cli
@@ -39,6 +39,7 @@ COPY redis-cluster.services.yml /bay
 COPY redis-single.services.yml /bay
 COPY settings.php /bay
 COPY db-build.sh /bay
+COPY db-dump-sanitized.sh /bay
 COPY mtk /bay/mtk
 
 # Change worker pool from dynamic to static. Change default value to 24.

diff --git a/images/php/README.md b/images/php/README.md
@@ -19,7 +19,7 @@ You can also use it in your Docker Compose stack with the following snippet:
 ```
 services:
   nginx:
-    image: singledigital/bay-php-fpm:5.x
+    image: singledigital/bay-php-fpm:6.x
     volumes:
       - path/to/app:/app
     ports:

diff --git a/images/php/db-build.sh b/images/php/db-build.sh
@@ -26,12 +26,7 @@ cleanup() {
 if [[ "${BASH_SOURCE[0]}" = "$0" ]]; then
   trap cleanup EXIT
   info "creating sanitized database dump with mtk - https://github.com/skpr/mtk"
-  mtk dump \
-    --user "${MARIADB_USERNAME}" \
-    --password "${MARIADB_PASSWORD}" \
-    --port "${MARIADB_PORT}" \
-    --host "${MARIADB_HOST}" \
-    "${MARIADB_DATABASE}" > "${DB_TEMPORARY_FILE}" || fatal "failed to dump database"
+  /bay/db-dump-sanitized.sh > "${DB_TEMPORARY_FILE}" || fatal "failed to dump database"
 
   info "pushing database dump to s3 - ${S3_OBJECT_PATH}"
   aws s3 cp --no-progress "${DB_TEMPORARY_FILE}" "${S3_OBJECT_PATH}" || fatal "failed to push dump to s3"

diff --git a/images/php/db-dump-sanitized.sh b/images/php/db-dump-sanitized.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+
+#/ Usage:       ./db-dump-sanitized.sh
+#/ Description: dumps a sanitized database to stdout
+#/ Options:
+#/   --help: Display this help message
+usage() { grep '^#/' "$0" | cut -c4- ; exit 0 ; }
+expr "$*" : ".*--help" > /dev/null && usage
+
+mtk dump \
+  --user "${MARIADB_USERNAME}" \
+  --password "${MARIADB_PASSWORD}" \
+  --port "${MARIADB_PORT}" \
+  --host "${MARIADB_HOST}" \
+  "${MARIADB_DATABASE}"