Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DDS-1874] Added php-curl pkg. #247

Merged
merged 9 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions images/awx-ee/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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: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

Expand All @@ -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:6.x --container-runtime docker
```

OR run with docker.
Expand All @@ -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:6.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:6.x context
```

## Deploying the image

```
$ docker push singledigital/awx-ee:latest
$ docker push ghcr.io/dpc-sdp/bay/awx-ee:6.x
```
14 changes: 8 additions & 6 deletions images/awx-ee/execution-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ 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/"
- 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"

append_final:
- | # Required dependencies.
Expand All @@ -43,9 +43,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-gd \
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.
Expand Down
2 changes: 1 addition & 1 deletion images/mailhog/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:6.x
ports:
- 1025
- 8025
Expand Down
2 changes: 1 addition & 1 deletion images/nginx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:6.x
volumes:
- path/to/app:/app
ports:
Expand Down
2 changes: 1 addition & 1 deletion images/node/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:6.x
volumes:
- path/to/app:/app
ports:
Expand Down
2 changes: 1 addition & 1 deletion images/php/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:6.x
volumes:
- path/to/app:/app
ports:
Expand Down
Loading