Skip to content

Moved packages from exit script to build image creation #2742

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

Merged
jimleroyer merged 3 commits into from
Jan 2, 2026
Merged

Moved packages from exit script to build image creation #2742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e2fec3
Moved packages from exit script to build image creation
jimleroyer Dec 31, 2025
9303371
Removed coreutils from the devcontainer package installation; this wo…
jimleroyer Dec 31, 2025
3379426
Ordered package to be the same across Dockerfile files
jimleroyer Jan 2, 2026
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
8 changes: 4 additions & 4 deletions .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ ENV POETRY_VERSION="1.7.1"
ENV POETRY_VENV_PATH="/home/vscode/.venv/workspace"

# Install packages
RUN apt-get update \
&& apt-get -y install --no-install-recommends \
RUN apt-get update && \
apt-get -y install --no-install-recommends \
apt-utils \
postgresql-client \
2>&1 \
&& apt-get -y install \
2>&1 && \
apt-get -y install \
curl \
dbus-x11 \
dnsutils \
Expand Down
18 changes: 17 additions & 1 deletion ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,23 @@ ENV POETRY_VERSION="1.7.1"
ENV POETRY_VIRTUALENVS_CREATE="false"
ENV PATH="${APP_VENV}/bin:${POETRY_HOME}/bin:$PATH"

RUN apk add --no-cache bash build-base git gcc musl-dev postgresql-dev g++ make libffi-dev libmagic libcurl curl-dev rust cargo && rm -rf /var/cache/apk/*
RUN apk add --no-cache bash \
build-base \
coreutils \
procps \
git \
gcc \
musl-dev \
postgresql-dev \
g++ \
make \
libffi-dev \
libmagic \
libcurl \
curl-dev \
rust \
cargo && \
rm -rf /var/cache/apk/*

RUN set -ex && mkdir /app
WORKDIR /app
Expand Down
15 changes: 14 additions & 1 deletion ci/Dockerfile.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,20 @@ ARG POETRY_VERSION="1.7.1"
ARG POETRY_VIRTUALENVS_CREATE="false"
ENV PATH="${APP_VENV}/bin:${POETRY_HOME}/bin:$PATH"

RUN apk add --no-cache bash build-base git gcc musl-dev postgresql-dev g++ make libffi-dev libmagic libcurl curl-dev && rm -rf /var/cache/apk/*
RUN apk add --no-cache bash \
build-base \
coreutils \
procps \
Comment on lines +15 to +16
Copy link

Copilot AI Dec 31, 2025

Choose a reason for hiding this comment

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

The package ordering is inconsistent between the two Alpine Dockerfiles. In ci/Dockerfile, procps appears before coreutils (lines 12-13), while in ci/Dockerfile.test, coreutils appears before procps (lines 15-16). For better maintainability and consistency, these packages should be ordered the same way in both files. Consider using alphabetical ordering for all packages to make the lists easier to maintain and compare.

Suggested change
coreutils \
procps \
procps \
coreutils \

Copilot uses AI. Check for mistakes.
git \
gcc \
musl-dev \
postgresql-dev \
g++ \
make \
libffi-dev \
libmagic \
libcurl \
curl-dev && rm -rf /var/cache/apk/*

RUN set -ex && mkdir /app
WORKDIR /app
Expand Down
2 changes: 0 additions & 2 deletions scripts/run_celery_exit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ function ensure_celery_is_running {


function on_exit {
apk add --no-cache procps
apk add --no-cache coreutils
Copy link
Member Author

@jimleroyer jimleroyer Dec 31, 2025

Choose a reason for hiding this comment

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

These are the two packages that we want to get installed earlier during Docker image creation.

echo "multi worker app exiting" >> /proc/1/fd/1
wait_time=0

Expand Down