Skip to content
Merged
Changes from all commits
Commits
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
12 changes: 10 additions & 2 deletions 20.0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@
ARG WKHTMLTOPDF_URL="https://github.com/wkhtmltopdf/packaging/releases/download/${WKHTMLTOPDF_VERSION}-3/wkhtmltox_${WKHTMLTOPDF_VERSION}-3.bookworm_${TARGETARCH}.deb"
ARG GEOIP_UPDATER_VERSION=6.0.0
ARG GEOIP_URL="https://github.com/maxmind/geoipupdate/releases/download/v${GEOIP_UPDATER_VERSION}/geoipupdate_${GEOIP_UPDATER_VERSION}_linux_${TARGETARCH}.deb"
ARG PAPER_MUCHER_VERSION="v0.7.1"
ARG PAPER_MUCHER_URL="https://github.com/odoo/paper-muncher/releases/download/${PAPER_MUCHER_VERSION}/paper-muncher_${PAPER_MUCHER_VERSION}_bookworm_${TARGETARCH}.deb"
WORKDIR /downloads
RUN if [ "$TARGETARCH" = "arm64" ]; then \
WKHTMLTOPDF_CHECKSUM=$WKHTMLTOPDF_ARM64_CHECKSUM; \
echo "Paper mucher not supported on ARM64 yet"; \
elif [ "$TARGETARCH" = "amd64" ]; then \
WKHTMLTOPDF_CHECKSUM=$WKHTMLTOPDF_AMD64_CHECKSUM; \
curl -SLo papermuncher.deb ${PAPER_MUCHER_URL}; \
else \
echo "Unsupported architecture: $TARGETARCH" >&2; \
exit 1; \
Expand All @@ -33,7 +37,7 @@
ARG LAST_SYSTEM_GID=499
ARG FIRST_UID=500
ARG FIRST_GID=500
ENV DB_FILTER=.* \

Check warning on line 40 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (20.0, amd64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 40 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (20.0, amd64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 40 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (20.0, amd64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 40 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (20.0, amd64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 40 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (20.0, arm64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 40 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (20.0, arm64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 40 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (20.0, arm64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 40 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (20.0, arm64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 40 in 20.0.Dockerfile

View workflow job for this annotation

GitHub Actions / test (20.0, 18, 3.12, amd64)

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "GEOIP_LICENSE_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
PGHOST_REPLICA=None \
PGPORT_REPLICA=None \
DEPTH_DEFAULT=1 \
Expand Down Expand Up @@ -95,6 +99,10 @@
openssh-client \
telnet \
vim \
&& if [ "$TARGETARCH" = "amd64" ]; then \
apt-get install -yqq --no-install-recommends \
/downloads/papermuncher.deb; \
fi \
&& apt-get autopurge -yqq \
&& sync

Expand Down Expand Up @@ -160,8 +168,8 @@
watchdog \
wdb \
rlPyCairo \
pycairo

pycairo \
markdown2
FROM foundation AS base
COPY --from=ctx / /
COPY --from=qa-builder /qa /qa
Expand Down
Loading