Merge "Use bookworm container images"

.zuul.yaml

@@ -232,8 +232,8 @@
     allowed-projects: zuul/zuul
     timeout: 2700  # 45 minutes
     requires:
-      - python-builder-3.11-bullseye-container-image
-      - python-base-3.11-bullseye-container-image
+      - python-builder-3.11-bookworm-container-image
+      - python-base-3.11-bookworm-container-image
     provides: zuul-container-image
     vars: &zuul_image_vars
       promote_container_image_method: intermediate-registry
@@ -300,8 +300,8 @@
     description: Build container images and upload.
     allowed-projects: zuul/zuul
     requires:
-      - python-builder-3.11-bullseye-container-image
-      - python-base-3.11-bullseye-container-image
+      - python-builder-3.11-bookworm-container-image
+      - python-base-3.11-bookworm-container-image
     provides: zuul-container-image
     secrets:
       name: container_registry_credentials

Dockerfile

@@ -13,13 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM docker.io/library/node:16-bullseye as js-builder
+FROM docker.io/library/node:16-bookworm as js-builder
 
 COPY web /tmp/src
 # Explicitly run the Javascript build
 RUN cd /tmp/src && yarn install -d && yarn build
 
-FROM docker.io/opendevorg/python-builder:3.11-bullseye as builder
+FROM docker.io/opendevorg/python-builder:3.11-bookworm as builder
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Optional location of Zuul API endpoint.
@@ -49,25 +49,11 @@ RUN /output/install-from-bindep \
   && echo $OPENSHIFT_SHA /tmp/openshift-install/openshift-client.tgz | sha256sum --check \
   && tar xvfz openshift-client.tgz -C /tmp/openshift-install
 
-
-FROM docker.io/library/golang:1.19-bullseye AS skopeo-builder
-RUN apt-get update \
-  && apt-get install -y git build-essential libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config \
-  && git clone https://github.com/containers/skopeo.git \
-  && cd skopeo && git checkout v1.9.3 \
-  && make bin/skopeo \
-  && cp bin/skopeo /tmp/skopeo
-
-FROM docker.io/opendevorg/python-base:3.11-bullseye as zuul
+FROM docker.io/opendevorg/python-base:3.11-bookworm as zuul
 ENV DEBIAN_FRONTEND=noninteractive
 
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep zuul_base \
-# Install newer bwrap from backports for --disable-userns support (>=0.8.0)
-  && apt-get update \
-  && apt-get install -y bubblewrap/bullseye-backports \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/* \
   && rm -rf /output \
   && useradd -u 10001 -m -d /var/lib/zuul -c "Zuul Daemon" zuul \
 # This enables git protocol v2 which is more efficient at negotiating
@@ -86,11 +72,8 @@ COPY --from=builder /tmp/openshift-install/oc /usr/local/bin/oc
 # Copy them only once and use a symlink to save space.
 RUN ln -s /usr/local/bin/oc /usr/local/bin/kubectl
 
-# See note above about this workaround.  These are the runtime
-# dependencies, this should just install skopeo when we upgrade.
-COPY --from=skopeo-builder /tmp/skopeo /usr/local/bin/skopeo
 RUN apt-get update \
-  && apt-get install -y libdevmapper1.02.1 libgpgme11 \
+  && apt-get install -y skopeo \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*