From b52b8b38233b0da5c26066a9a28cca353e5c6cee Mon Sep 17 00:00:00 2001 From: Daniel Thorn Date: Tue, 19 Nov 2024 12:55:26 -0800 Subject: [PATCH] OBS-144: Use docker images from obs-common --- docker/images/fakesentry/Dockerfile | 25 +------------------------ docker/images/gcs-emulator/Dockerfile | 5 +---- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/docker/images/fakesentry/Dockerfile b/docker/images/fakesentry/Dockerfile index b64e5f6d..8915748e 100644 --- a/docker/images/fakesentry/Dockerfile +++ b/docker/images/fakesentry/Dockerfile @@ -1,24 +1 @@ -# This should be kept in sync with the python version used in .devcontainer/Dockerfile and -# docker/Dockerfile -FROM python:3.11.10-slim-bullseye@sha256:d910a25afa706e0b2da4b59990fb59c0495eeab597b5cd777bbdcda8b6530b7e - -WORKDIR /app/ - -RUN groupadd -r kent && useradd --no-log-init -r -g kent kent - -RUN apt-get update && \ - apt-get install -y --no-install-recommends curl tini && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -ENV PYTHONUNBUFFERED=1 \ - PYTHONDONTWRITEBYTECODE=1 - -RUN pip install -U 'pip>=20' && \ - pip install --no-cache-dir 'kent==2.0.0' - -USER kent - -ENTRYPOINT ["tini", "--", "/usr/local/bin/kent-server"] -CMD ["run"] +FROM us-docker.pkg.dev/moz-fx-cavendish-prod/cavendish-prod/fakesentry:v2024.11.19-1@sha256:48b73aa08022eeada40fb878dc25ab225f2f91022961ffbce14ae23a7e6bdcd1 diff --git a/docker/images/gcs-emulator/Dockerfile b/docker/images/gcs-emulator/Dockerfile index b60eaff3..704e760c 100644 --- a/docker/images/gcs-emulator/Dockerfile +++ b/docker/images/gcs-emulator/Dockerfile @@ -1,4 +1 @@ -FROM fsouza/fake-gcs-server:1.50.2@sha256:23996047676fe5312001b828d800670519181c57a5943c2270e7421f3ab3f477 - -# add curl for use in healthcheck -RUN apk add --no-cache curl +FROM us-docker.pkg.dev/moz-fx-cavendish-prod/cavendish-prod/gcs-emulator:v2024.11.19-1@sha256:a02a86372ffe26c9f07cb55bf2d1551935389f0469d7e7dd0b69580879a00731