chore: Upgrade to Quay image 3.7.0 (PROJQUAY-3867) (#65)

Upgrading the Quay image to use 3.7.0. Signed-off-by: Dave O'Connor <doconnor@redhat.com>
quay · May 27, 2022 · e95bf17 · e95bf17
1 parent b01abfd
commit e95bf17
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/.env b/.env
@@ -1,8 +1,8 @@
 EE_IMAGE=quay.io/quay/mirror-registry-ee:latest
-EE_BASE_IMAGE=registry.redhat.io/ansible-automation-platform-20-early-access/ee-minimal-rhel8
-EE_BUILDER_IMAGE=registry.redhat.io/ansible-automation-platform-20-early-access/ansible-builder-rhel8:2.0.0-15
-POSTGRES_IMAGE=registry.redhat.io/rhel8/postgresql-10:1-161
-QUAY_IMAGE=registry.redhat.io/quay/quay-rhel8:v3.6.4
-REDIS_IMAGE=registry.redhat.io/rhel8/redis-6:1-25
-RELEASE_VERSION=v1.1.0
-PAUSE_IMAGE=registry.access.redhat.com/ubi8/pause:latest
+EE_BASE_IMAGE=registry.redhat.io/ansible-automation-platform-22/ee-minimal-rhel8:1.0.0-128
+EE_BUILDER_IMAGE=registry.redhat.io/ansible-automation-platform-22/ansible-builder-rhel8:1.1.0-32
+POSTGRES_IMAGE=registry.redhat.io/rhel8/postgresql-10:1-184
+QUAY_IMAGE=registry.redhat.io/quay/quay-rhel8:v3.7.0
+REDIS_IMAGE=registry.redhat.io/rhel8/redis-6:1-56
+RELEASE_VERSION=v1.2.0
+PAUSE_IMAGE=registry.access.redhat.com/ubi8/pause:latest
diff --git a/ansible-runner/context/Containerfile b/ansible-runner/context/Containerfile
@@ -1,5 +1,5 @@
-ARG EE_BASE_IMAGE=registry.redhat.io/ansible-automation-platform-20-early-access/ee-minimal-rhel8
-ARG EE_BUILDER_IMAGE=quay.io/ansible/ansible-builder:latest
+ARG EE_BASE_IMAGE=registry.redhat.io/ansible-automation-platform-22/ee-minimal-rhel8:1.0.0-128
+ARG EE_BUILDER_IMAGE=registry.redhat.io/ansible-automation-platform-22/ansible-builder-rhel8:1.1.0-32
 
 FROM $EE_BASE_IMAGE as galaxy
 ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS=

diff --git a/ansible-runner/context/_build/requirements.yml b/ansible-runner/context/_build/requirements.yml
@@ -2,5 +2,4 @@
 collections:
   - ansible.posix
   - containers.podman
-  - community.crypto
   - community.general
diff --git a/...ble-runner/context/app/project/roles/mirror_appliance/tasks/autodetect-image-archive.yaml b/...ble-runner/context/app/project/roles/mirror_appliance/tasks/autodetect-image-archive.yaml
@@ -21,12 +21,12 @@
 
 - name: Loading Redis if redis.tar exists
   shell: 
-    cmd: podman image import --change 'ENV PATH=/opt/app-root/src/bin:/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' --change 'ENV container=oci'  --change 'ENV STI_SCRIPTS_URL=image:///usr/libexec/s2i' --change 'ENV STI_SCRIPTS_PATH=/usr/libexec/s2i' --change 'ENV APP_ROOT=/opt/app-root' --change 'ENV HOME=/var/lib/redis' --change 'ENV PLATFORM=el8' --change 'ENV REDIS_VERSION=6' --change 'ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/redis' --change 'ENV REDIS_PREFIX=/usr' --change 'ENTRYPOINT=["container-entrypoint"]' --change 'USER=1001' --change 'WORKDIR=/opt/app-root/src' --change 'EXPOSE=6379' --change 'VOLUME=/var/lib/redis/data' --change 'CMD ["run-redis"]' - {{ redis_image }} < {{ quay_root }}/redis.tar
+    cmd: podman image import --change 'ENV PATH=/opt/app-root/src/bin:/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' --change 'ENV container=oci'  --change 'ENV STI_SCRIPTS_URL=image:///usr/libexec/s2i' --change 'ENV STI_SCRIPTS_PATH=/usr/libexec/s2i' --change 'ENV APP_ROOT=/opt/app-root' --change 'ENV HOME=/var/lib/redis' --change 'ENV PLATFORM=el8' --change 'ENV REDIS_VERSION=6' --change 'ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/redis' --change 'ENV REDIS_PREFIX=/usr' --change 'ENV REDIS_CONF=/etc/redis.conf' --change 'ENTRYPOINT=["container-entrypoint"]' --change 'USER=1001' --change 'WORKDIR=/opt/app-root/src' --change 'EXPOSE=6379' --change 'VOLUME=/var/lib/redis/data' --change 'CMD ["run-redis"]' - {{ redis_image }} < {{ quay_root }}/redis.tar
   when: p.stat.exists and local_install == "false"
 
 - name: Loading Quay if quay.tar exists
   shell: 
-    cmd: podman image import --change 'ENV PATH=/.local/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' --change 'ENV RED_HAT_QUAY=true' --change 'ENV PYTHON_VERSION=3.8' --change 'ENV PYTHON_ROOT=/usr/local/lib/python3.8' --change 'ENV PYTHONUNBUFFERED=1' --change 'ENV PYTHONIOENCODING=UTF-8' --change 'ENV LANG=en_US.utf8' --change 'ENV QUAYDIR=/quay-registry' --change 'ENV QUAYCONF=/quay-registry/conf' --change 'ENV QUAYPATH=.' --change 'ENV container=oci' --change 'ENTRYPOINT=["dumb-init","--","/quay-registry/quay-entrypoint.sh"]' --change 'WORKDIR=/quay-registry' --change 'EXPOSE=7443' --change 'EXPOSE=8080' --change 'EXPOSE=8443' --change 'VOLUME=/conf/stack' --change 'VOLUME=/datastorage' --change 'VOLUME=/tmp' --change 'VOLUME=/var/log' --change 'USER=1001' --change 'CMD ["registry"]' - {{ quay_image }} < {{ quay_root }}/quay.tar
+    cmd: podman image import --change 'ENV PATH=/.local/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' --change 'ENV RED_HAT_QUAY=true' --change 'ENV PYTHON_VERSION=3.8' --change 'ENV PYTHON_ROOT=/usr/local/lib/python3.8' --change 'ENV PYTHONUNBUFFERED=1' --change 'ENV PYTHONIOENCODING=UTF-8' --change 'ENV LANG=en_US.utf8' --change 'ENV QUAYDIR=/quay-registry' --change 'ENV QUAYCONF=/quay-registry/conf' --change 'ENV QUAYRUN=/quay-registry/conf' --change 'ENV QUAYPATH=.' --change 'ENV container=oci' --change 'ENTRYPOINT=["dumb-init","--","/quay-registry/quay-entrypoint.sh"]' --change 'WORKDIR=/quay-registry' --change 'EXPOSE=7443' --change 'EXPOSE=8080' --change 'EXPOSE=8443' --change 'VOLUME=/conf/stack' --change 'VOLUME=/datastorage' --change 'VOLUME=/tmp' --change 'VOLUME=/var/log' --change 'USER=1001' --change 'CMD ["registry"]' - {{ quay_image }} < {{ quay_root }}/quay.tar
   when: p.stat.exists and local_install == "false"
 
 - name: Loading Postgres if postgres.tar exists

diff --git a/ansible-runner/execution-environment.yml b/ansible-runner/execution-environment.yml
@@ -2,7 +2,7 @@
 version: 1
 
 build_arg_defaults:
-  EE_BASE_IMAGE: registry.redhat.io/ansible-automation-platform-20-early-access/ee-minimal-rhel8
+  EE_BASE_IMAGE: registry.redhat.io/ansible-automation-platform-22/ee-minimal-rhel8:1.0.0-128
 
 dependencies:
   galaxy: requirements.yml

diff --git a/ansible-runner/requirements.yml b/ansible-runner/requirements.yml
@@ -2,5 +2,4 @@
 collections:
   - ansible.posix
   - containers.podman
-  - community.crypto
   - community.general
diff --git a/cmd/utils.go b/cmd/utils.go
@@ -215,6 +215,7 @@ func getImageMetadata(app, imageName, archivePath string) string {
 					--change 'ENV REDIS_VERSION=6' \
 					--change 'ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/redis' \
 					--change 'ENV REDIS_PREFIX=/usr' \
+					--change 'ENV REDIS_CONF=/etc/redis.conf' \
 					--change 'ENTRYPOINT=["container-entrypoint"]' \
 					--change 'USER=1001' \
 					--change 'WORKDIR=/opt/app-root/src' \
@@ -253,6 +254,7 @@ func getImageMetadata(app, imageName, archivePath string) string {
 					--change 'ENV LANG=en_US.utf8' \
 					--change 'ENV QUAYDIR=/quay-registry' \
 					--change 'ENV QUAYCONF=/quay-registry/conf' \
+					--change 'ENV QUAYRUN=/quay-registry/conf' \
 					--change 'ENV QUAYPATH=.' \
 					--change 'ENV container=oci' \
 					--change 'ENTRYPOINT=["dumb-init","--","/quay-registry/quay-entrypoint.sh"]' \