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.

Sign up for GitHub

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

Jump to bottom

OBS-144: Use docker images from obs-common #1127

Merged
merged 1 commit into from
Nov 20, 2024
Merged

OBS-144: Use docker images from obs-common #1127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 1 addition & 24 deletions docker/images/fakesentry/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I somehow came to the conclusion that Antenna didn't use tini, while it totally did. No idea how I managed to get that wrong. It's also using tini in the main Docker image. I'll file a PR to remove that.

CMD ["run"]
FROM us-docker.pkg.dev/moz-fx-cavendish-prod/cavendish-prod/fakesentry:v2024.11.19-1@sha256:48b73aa08022eeada40fb878dc25ab225f2f91022961ffbce14ae23a7e6bdcd1
5 changes: 1 addition & 4 deletions docker/images/gcs-emulator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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