From 1d86b687bf9b9cad86279e17af337455554d9d18 Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Wed, 28 Feb 2024 20:52:05 +1100 Subject: [PATCH 1/9] [DDS-1874] Added php-curl pkg. --- images/awx-ee/execution-environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml index 3e6fe2a0..e06b9104 100644 --- a/images/awx-ee/execution-environment.yml +++ b/images/awx-ee/execution-environment.yml @@ -44,6 +44,7 @@ additional_build_steps: curl -sSL https://packages.sury.org/php/README.txt | bash -x; \ apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ php8.3-cli \ + php8.3-curl \ php8.3-gd \ php8.3-zip; \ rm -rf /var/lib/apt/lists/*; From 14491ce3e7b9bafd4ca09c05a36becd89870d3ea Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Thu, 29 Feb 2024 08:31:29 +1100 Subject: [PATCH 2/9] [DDS-1874] Added php-xml pkg for ext-dom. --- images/awx-ee/execution-environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml index e06b9104..6529e33c 100644 --- a/images/awx-ee/execution-environment.yml +++ b/images/awx-ee/execution-environment.yml @@ -46,6 +46,7 @@ additional_build_steps: php8.3-cli \ php8.3-curl \ php8.3-gd \ + php8.3-xml; \ php8.3-zip; \ rm -rf /var/lib/apt/lists/*; From 6cb01031a5c6f8a2cead8d255fdf450089a72c63 Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Thu, 29 Feb 2024 09:14:30 +1100 Subject: [PATCH 3/9] [DDS-1874] Fixed syntax error. --- images/awx-ee/execution-environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml index 6529e33c..b7799c0d 100644 --- a/images/awx-ee/execution-environment.yml +++ b/images/awx-ee/execution-environment.yml @@ -46,7 +46,7 @@ additional_build_steps: php8.3-cli \ php8.3-curl \ php8.3-gd \ - php8.3-xml; \ + php8.3-xml \ php8.3-zip; \ rm -rf /var/lib/apt/lists/*; From 67c6c47ed9c3321fb004803d60866f35365923c1 Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Thu, 29 Feb 2024 12:31:18 +1100 Subject: [PATCH 4/9] [DDS-1872] Updated readmes. --- images/awx-ee/README.md | 10 +++++----- images/mailhog/README.md | 2 +- images/nginx/README.md | 2 +- images/node/README.md | 2 +- images/php/README.md | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/images/awx-ee/README.md b/images/awx-ee/README.md index 654f47fd..cc559f5b 100644 --- a/images/awx-ee/README.md +++ b/images/awx-ee/README.md @@ -9,7 +9,7 @@ The AWX execution environment is a container image that AWX will use to execute - `requirements.txt`: Defined python dependencies - `requirements.yml`: Ansible collections to install -AWX has `singledigital/awx-ee:latest` added as an execution environment with a pull policy of always, when the image is updated kuberenetes will pull a new image to run the plays in. +AWX has `ghcr.io/dpc-sdp/bay/awx-ee:5.x` added as an execution environment with a pull policy of always, when the image is updated kuberenetes will pull a new image to run the plays in. ## Dependencies @@ -20,7 +20,7 @@ AWX has `singledigital/awx-ee:latest` added as an execution environment with a p Commands run from this directory if you have ansible-builder installed locally. ``` -$ ansible-builder build --tag singledigital/awx-ee:latest --container-runtime docker +$ ansible-builder build --tag ghcr.io/dpc-sdp/bay/awx-ee:5.x --container-runtime docker ``` OR run with docker. @@ -31,14 +31,14 @@ $ docker run --rm -it \ -v $(pwd):/data \ -w /data \ quay.io/ansible/ansible-builder:latest \ - ansible-builder build --tag singledigital/awx-ee:latest --container-runtime docker + ansible-builder build --tag ghcr.io/dpc-sdp/bay/awx-ee:5.x --container-runtime docker # Build the image -$ docker build -f context/Dockerfile -t singledigital/awx-ee:latest context +$ docker build -f context/Dockerfile -t ghcr.io/dpc-sdp/bay/awx-ee:5.x context ``` ## Deploying the image ``` -$ docker push singledigital/awx-ee:latest +$ docker push ghcr.io/dpc-sdp/bay/awx-ee:5.x ``` diff --git a/images/mailhog/README.md b/images/mailhog/README.md index ea93a5c9..dd6aef23 100644 --- 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:6.x + image: ghcr.io/dpc-sdp/bay/mailhog:5.x ports: - 1025 - 8025 diff --git a/images/nginx/README.md b/images/nginx/README.md index a0f56489..960a5ae2 100644 --- 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:6.x + image: ghcr.io/dpc-sdp/bay/nginx:5.x volumes: - path/to/app:/app ports: diff --git a/images/node/README.md b/images/node/README.md index 3803df91..827c59a5 100644 --- 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:6.x + image: ghcr.io/dpc-sdp/bay/node:5.x volumes: - path/to/app:/app ports: diff --git a/images/php/README.md b/images/php/README.md index e4532cd5..71880274 100644 --- 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:6.x + image: ghcr.io/dpc-sdp/bay/php-fpm:5.x volumes: - path/to/app:/app ports: From 82404ed03015f27d2df6767abab6bad9ff3aa19d Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Thu, 29 Feb 2024 12:36:00 +1100 Subject: [PATCH 5/9] [DDS-1872] Cast php version to variable. --- images/awx-ee/execution-environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml index b7799c0d..13caed8e 100644 --- a/images/awx-ee/execution-environment.yml +++ b/images/awx-ee/execution-environment.yml @@ -28,6 +28,7 @@ additional_build_steps: - ARG NVM_INSTALL_VERSION=v0.39.7 - ARG NODE_VERSION=v18.17.0 - ARG NVM_DIR="/runner/.nvm" + - ARG PHP_VERSION="8.2" append_final: - | # Required dependencies. From a6bc1cce02c68c35feccfeff6a4ce12380e98bd5 Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Thu, 29 Feb 2024 12:57:12 +1100 Subject: [PATCH 6/9] [DDS-1874] Cast php version to variable. --- images/awx-ee/execution-environment.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml index 13caed8e..5f198a88 100644 --- a/images/awx-ee/execution-environment.yml +++ b/images/awx-ee/execution-environment.yml @@ -28,7 +28,7 @@ additional_build_steps: - ARG NVM_INSTALL_VERSION=v0.39.7 - ARG NODE_VERSION=v18.17.0 - ARG NVM_DIR="/runner/.nvm" - - ARG PHP_VERSION="8.2" + - ARG PHP_VERSION="8.3" append_final: - | # Required dependencies. @@ -44,11 +44,11 @@ additional_build_steps: RUN set -eux; \ curl -sSL https://packages.sury.org/php/README.txt | bash -x; \ apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ - php8.3-cli \ - php8.3-curl \ - php8.3-gd \ - php8.3-xml \ - php8.3-zip; \ + php${PHP_VERSION}-cli \ + php${PHP_VERSION}-curl \ + php${PHP_VERSION}-gd \ + php${PHP_VERSION}-xml \ + php${PHP_VERSION}-zip; \ rm -rf /var/lib/apt/lists/*; - | # Install cli tools. From e8c76963fad59d241566da36db236f40a443ecc7 Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Thu, 29 Feb 2024 15:20:56 +1100 Subject: [PATCH 7/9] [DDS-1874] Updated AWX-EE labels --- images/awx-ee/execution-environment.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml index 5f198a88..a11e61ff 100644 --- a/images/awx-ee/execution-environment.yml +++ b/images/awx-ee/execution-environment.yml @@ -19,8 +19,7 @@ additional_build_steps: append_base: [] prepend_final: - - LABEL maintainer="Digital Transformation" - - LABEL org.opencontainers.image.authors="Digital Transformation" + - LABEL maintainer="Department of Government Services (Victoria)" - LABEL org.opencontainers.image.title="SDP AWX Execution Environment image." - LABEL org.opencontainers.image.description="Provides an AWX execution environment image optimised for use with SDP. Built with ansible-builder." - LABEL org.opencontainers.image.source="https://github.com/dpc-sdp/bay/blob/6.x/images/awx-ee/" From 72089a0a3262cd6f3828fd7100ff6d63573890d1 Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Thu, 29 Feb 2024 15:21:21 +1100 Subject: [PATCH 8/9] [DDS-1874] Bumped node version to match bay node image. --- images/awx-ee/execution-environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml index a11e61ff..f5d1cf14 100644 --- a/images/awx-ee/execution-environment.yml +++ b/images/awx-ee/execution-environment.yml @@ -25,7 +25,7 @@ additional_build_steps: - LABEL org.opencontainers.image.source="https://github.com/dpc-sdp/bay/blob/6.x/images/awx-ee/" - ARG LAGOON_CLI_VERSION=v0.15.4 - ARG NVM_INSTALL_VERSION=v0.39.7 - - ARG NODE_VERSION=v18.17.0 + - ARG NODE_VERSION=v20.9.0 - ARG NVM_DIR="/runner/.nvm" - ARG PHP_VERSION="8.3" From a3e31f9b8fa90aa427b18aef631da6bb51a88d95 Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Thu, 29 Feb 2024 15:33:12 +1100 Subject: [PATCH 9/9] [DDS-1874] Fixed tag reference. --- images/awx-ee/README.md | 10 +++++----- images/mailhog/README.md | 2 +- images/nginx/README.md | 2 +- images/node/README.md | 2 +- images/php/README.md | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/images/awx-ee/README.md b/images/awx-ee/README.md index cc559f5b..0b9eea21 100644 --- a/images/awx-ee/README.md +++ b/images/awx-ee/README.md @@ -9,7 +9,7 @@ The AWX execution environment is a container image that AWX will use to execute - `requirements.txt`: Defined python dependencies - `requirements.yml`: Ansible collections to install -AWX has `ghcr.io/dpc-sdp/bay/awx-ee:5.x` added as an execution environment with a pull policy of always, when the image is updated kuberenetes will pull a new image to run the plays in. +AWX has `ghcr.io/dpc-sdp/bay/awx-ee:6.x` added as an execution environment with a pull policy of always, when the image is updated kuberenetes will pull a new image to run the plays in. ## Dependencies @@ -20,7 +20,7 @@ AWX has `ghcr.io/dpc-sdp/bay/awx-ee:5.x` added as an execution environment with Commands run from this directory if you have ansible-builder installed locally. ``` -$ ansible-builder build --tag ghcr.io/dpc-sdp/bay/awx-ee:5.x --container-runtime docker +$ ansible-builder build --tag ghcr.io/dpc-sdp/bay/awx-ee:6.x --container-runtime docker ``` OR run with docker. @@ -31,14 +31,14 @@ $ docker run --rm -it \ -v $(pwd):/data \ -w /data \ quay.io/ansible/ansible-builder:latest \ - ansible-builder build --tag ghcr.io/dpc-sdp/bay/awx-ee:5.x --container-runtime docker + ansible-builder build --tag ghcr.io/dpc-sdp/bay/awx-ee:6.x --container-runtime docker # Build the image -$ docker build -f context/Dockerfile -t ghcr.io/dpc-sdp/bay/awx-ee:5.x context +$ docker build -f context/Dockerfile -t ghcr.io/dpc-sdp/bay/awx-ee:6.x context ``` ## Deploying the image ``` -$ docker push ghcr.io/dpc-sdp/bay/awx-ee:5.x +$ docker push ghcr.io/dpc-sdp/bay/awx-ee:6.x ``` diff --git a/images/mailhog/README.md b/images/mailhog/README.md index dd6aef23..7e4aa681 100644 --- 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: ghcr.io/dpc-sdp/bay/mailhog:5.x + image: ghcr.io/dpc-sdp/bay/mailhog:6.x ports: - 1025 - 8025 diff --git a/images/nginx/README.md b/images/nginx/README.md index 960a5ae2..f4c79188 100644 --- 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: ghcr.io/dpc-sdp/bay/nginx:5.x + image: ghcr.io/dpc-sdp/bay/nginx:6.x volumes: - path/to/app:/app ports: diff --git a/images/node/README.md b/images/node/README.md index 827c59a5..f69a5566 100644 --- 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: ghcr.io/dpc-sdp/bay/node:5.x + image: ghcr.io/dpc-sdp/bay/node:6.x volumes: - path/to/app:/app ports: diff --git a/images/php/README.md b/images/php/README.md index 71880274..4172046c 100644 --- 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: ghcr.io/dpc-sdp/bay/php-fpm:5.x + image: ghcr.io/dpc-sdp/bay/php-fpm:6.x volumes: - path/to/app:/app ports: