diff --git a/CHANGES/537.dev b/CHANGES/537.dev new file mode 100644 index 00000000..ccb88113 --- /dev/null +++ b/CHANGES/537.dev @@ -0,0 +1 @@ +CentOS Stream 9 is now used as the base image rather than CentOS Stream 8. diff --git a/images/Containerfile.core.base b/images/Containerfile.core.base index 6957fb46..28365e7b 100644 --- a/images/Containerfile.core.base +++ b/images/Containerfile.core.base @@ -1,4 +1,4 @@ -FROM quay.io/centos/centos:stream8 +FROM quay.io/centos/centos:stream9 # https://ryandaniels.ca/blog/docker-dockerfile-arg-from-arg-trouble/ # https://superuser.com/questions/959380/how-do-i-install-generate-all-locales-on-fedora @@ -18,15 +18,12 @@ ENV PULP_GUNICORN_TIMEOUT=${PULP_GUNICORN_TIMEOUT:-90} ENV PULP_API_WORKERS=${PULP_API_WORKERS:-2} ENV PULP_CONTENT_WORKERS=${PULP_CONTENT_WORKERS:-2} -# Install updates & dnf plugins before disabling python36 to prevent errors +# Install updates & dnf plugins RUN dnf -y install dnf-plugins-core && \ - dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ - dnf config-manager --set-enabled powertools && \ + dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ + dnf config-manager --set-enabled crb && \ dnf -y update -# use python38 -RUN dnf -y module disable python36 -RUN dnf -y module enable python38 RUN dnf -y module enable nginx:1.22 # glibc-langpack-en is needed to provide the en_US.UTF-8 locale, which Pulp @@ -37,7 +34,7 @@ RUN dnf -y module enable nginx:1.22 # # TODO: Investigate differences between `dnf builddep createrepo_c` vs the list # of dependencies below. For example, drpm-devel. -RUN dnf -y install python38 python38-cryptography python38-devel && \ +RUN dnf -y install python3 python3-cryptography python3-devel && \ dnf -y install openssl openssl-devel && \ dnf -y install openldap-devel && \ dnf -y install wget git && \ diff --git a/images/galaxy-minimal/nightly/Containerfile.webserver b/images/galaxy-minimal/nightly/Containerfile.webserver index 12bf5fe5..0af786b2 100644 --- a/images/galaxy-minimal/nightly/Containerfile.webserver +++ b/images/galaxy-minimal/nightly/Containerfile.webserver @@ -3,9 +3,9 @@ FROM pulp/galaxy-minimal:${FROM_TAG} as builder RUN mkdir -p /etc/nginx/pulp \ /www/data -RUN ln /usr/local/lib/python3.8/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf -RUN ln /usr/local/lib/python3.8/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf -RUN ln /usr/local/lib/python3.8/site-packages/galaxy_ng/app/webserver_snippets/nginx.conf /etc/nginx/pulp/galaxy_ng.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf +RUN ln /usr/local/lib/python3.9/site-packages/galaxy_ng/app/webserver_snippets/nginx.conf /etc/nginx/pulp/galaxy_ng.conf RUN cp -fr /usr/local/lib/python3.8/site-packages/galaxy_ng/app/static/galaxy_ng/. /www/data diff --git a/images/galaxy-minimal/stable/Containerfile.webserver b/images/galaxy-minimal/stable/Containerfile.webserver index 3dab8603..7d5e9b48 100644 --- a/images/galaxy-minimal/stable/Containerfile.webserver +++ b/images/galaxy-minimal/stable/Containerfile.webserver @@ -3,9 +3,9 @@ FROM pulp/galaxy-minimal:${FROM_TAG} as builder RUN mkdir -p /etc/nginx/pulp \ /www/data -RUN ln /usr/local/lib/python3.8/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf -RUN ln /usr/local/lib/python3.8/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf -RUN ln /usr/local/lib/python3.8/site-packages/galaxy_ng/app/webserver_snippets/nginx.conf /etc/nginx/pulp/galaxy_ng.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf +RUN ln /usr/local/lib/python3.9/site-packages/galaxy_ng/app/webserver_snippets/nginx.conf /etc/nginx/pulp/galaxy_ng.conf RUN cp -fr /usr/local/lib/python3.8/site-packages/galaxy_ng/app/static/galaxy_ng/. /www/data diff --git a/images/galaxy/nightly/Containerfile b/images/galaxy/nightly/Containerfile index 188cd28e..536b90e7 100644 --- a/images/galaxy/nightly/Containerfile +++ b/images/galaxy/nightly/Containerfile @@ -13,9 +13,9 @@ RUN PULP_STATIC_ROOT=/var/lib/operator/static/ PULP_CONTENT_ORIGIN=localhost \ /usr/local/bin/pulpcore-manager collectstatic --clear --noinput --link USER root:root -RUN ln /usr/local/lib/python3.8/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf -RUN ln /usr/local/lib/python3.8/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf -RUN ln /usr/local/lib/python3.8/site-packages/galaxy_ng/app/webserver_snippets/nginx.conf /etc/nginx/pulp/galaxy_ng.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf +RUN ln /usr/local/lib/python3.9/site-packages/galaxy_ng/app/webserver_snippets/nginx.conf /etc/nginx/pulp/galaxy_ng.conf # allow configuration via env variables ENV S6_KEEP_ENV=1 diff --git a/images/galaxy/stable/Containerfile b/images/galaxy/stable/Containerfile index 212644a7..e7abcb3e 100644 --- a/images/galaxy/stable/Containerfile +++ b/images/galaxy/stable/Containerfile @@ -15,9 +15,9 @@ RUN PULP_STATIC_ROOT=/var/lib/operator/static/ PULP_CONTENT_ORIGIN=localhost \ /usr/local/bin/pulpcore-manager collectstatic --clear --noinput --link USER root:root -RUN ln /usr/local/lib/python3.8/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf -RUN ln /usr/local/lib/python3.8/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf -RUN ln /usr/local/lib/python3.8/site-packages/galaxy_ng/app/webserver_snippets/nginx.conf /etc/nginx/pulp/galaxy_ng.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf +RUN ln /usr/local/lib/python3.9/site-packages/galaxy_ng/app/webserver_snippets/nginx.conf /etc/nginx/pulp/galaxy_ng.conf # allow configuration via env variables ENV S6_KEEP_ENV=1 diff --git a/images/pulp-minimal/nightly/Containerfile.webserver b/images/pulp-minimal/nightly/Containerfile.webserver index 47a6b697..dfd7c370 100644 --- a/images/pulp-minimal/nightly/Containerfile.webserver +++ b/images/pulp-minimal/nightly/Containerfile.webserver @@ -3,9 +3,9 @@ FROM pulp/pulp-minimal:${FROM_TAG} as builder RUN mkdir -p /etc/nginx/pulp \ /www/data -RUN ln /usr/local/lib/python3.8/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf -RUN ln /usr/local/lib/python3.8/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf -RUN ln /usr/local/lib/python3.8/site-packages/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf diff --git a/images/pulp-minimal/stable/Containerfile.webserver b/images/pulp-minimal/stable/Containerfile.webserver index e1ba624a..8e9efd3f 100644 --- a/images/pulp-minimal/stable/Containerfile.webserver +++ b/images/pulp-minimal/stable/Containerfile.webserver @@ -3,9 +3,9 @@ FROM pulp/pulp-minimal:${FROM_TAG} as builder RUN mkdir -p /etc/nginx/pulp \ /www/data -RUN ln /usr/local/lib/python3.8/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf -RUN ln /usr/local/lib/python3.8/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf -RUN ln /usr/local/lib/python3.8/site-packages/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf diff --git a/images/pulp/nightly/Containerfile b/images/pulp/nightly/Containerfile index 681795ad..91d5748c 100644 --- a/images/pulp/nightly/Containerfile +++ b/images/pulp/nightly/Containerfile @@ -22,6 +22,6 @@ RUN PULP_STATIC_ROOT=/var/lib/operator/static/ PULP_CONTENT_ORIGIN=localhost \ /usr/local/bin/pulpcore-manager collectstatic --clear --noinput --link USER root:root -RUN ln /usr/local/lib/python3.8/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf -RUN ln /usr/local/lib/python3.8/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf -RUN ln /usr/local/lib/python3.8/site-packages/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf diff --git a/images/pulp/stable/Containerfile b/images/pulp/stable/Containerfile index ab938eed..03d8a363 100644 --- a/images/pulp/stable/Containerfile +++ b/images/pulp/stable/Containerfile @@ -33,6 +33,6 @@ RUN PULP_STATIC_ROOT=/var/lib/operator/static/ PULP_CONTENT_ORIGIN=localhost \ /usr/local/bin/pulpcore-manager collectstatic --clear --noinput --link USER root:root -RUN ln /usr/local/lib/python3.8/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf -RUN ln /usr/local/lib/python3.8/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf -RUN ln /usr/local/lib/python3.8/site-packages/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf diff --git a/images/pulp_ci_centos/Containerfile b/images/pulp_ci_centos/Containerfile index f1ee725f..c4dece02 100644 --- a/images/pulp_ci_centos/Containerfile +++ b/images/pulp_ci_centos/Containerfile @@ -22,8 +22,7 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=1 # https://github.com/just-containers/s6-overlay/issues/467 ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 -RUN dnf -y module enable postgresql:13 && \ - dnf -y install postgresql && \ +RUN dnf -y install postgresql && \ dnf -y install postgresql-contrib && \ dnf -y install postgresql-server && \ dnf -y install postgresql-upgrade && \ diff --git a/images/pulp_debuginfod/Containerfile b/images/pulp_debuginfod/Containerfile index c91cae56..6af4a04b 100644 --- a/images/pulp_debuginfod/Containerfile +++ b/images/pulp_debuginfod/Containerfile @@ -30,9 +30,9 @@ RUN pip3 install --upgrade \ requests && \ rm -rf /root/.cache/pip -RUN ln /usr/local/lib/python3.8/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf -RUN ln /usr/local/lib/python3.8/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf -RUN ln /usr/local/lib/python3.8/site-packages/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf +RUN ln /usr/local/lib/python3.9/site-packages/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf # Install debuginfod and run as a background process RUN dnf -y install elfutils-debuginfod