File tree Expand file tree Collapse file tree 2 files changed +26
-4
lines changed Expand file tree Collapse file tree 2 files changed +26
-4
lines changed Original file line number Diff line number Diff line change @@ -1712,10 +1712,21 @@ FROM --platform=linux/$ARCH setup_mig_configs AS start_mig
1712
1712
ARG DOMAIN
1713
1713
1714
1714
# Reap defuncted/orphaned processes
1715
- # IMPORTANT: always verify tini gpg signature and use checksum in download here
1715
+ # IMPORTANT: always verify gpg signature / use verified checksum in downloads!
1716
1716
ARG TINI_VERSION=v0.18.0
1717
1717
ARG TINI_CHECKSUM=sha256:12d20136605531b09a2c2dac02ccee85e1b874eb322ef6baf7561cd93f93c855
1718
- ADD --checksum=${TINI_CHECKSUM} https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
1718
+ ARG TINI_GPG_KEY=0527A9B7
1719
+ # NOTE: hadolint awaits https://github.com/hadolint/language-docker/pull/92 in
1720
+ # an actual release so it will currectly fail hard on the checksum arg.
1721
+ # Rely solely on explicit gpg signature verification for the time being.
1722
+ #ADD --checksum=${TINI_CHECKSUM} https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
1723
+ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
1724
+ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc /tini.asc
1725
+ RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys ${TINI_GPG_KEY} \
1726
+ && if ! gpg --verify /tini.asc /tini ; then \
1727
+ echo "FATAL: failed to verify tini binary"; \
1728
+ exit 1 ; \
1729
+ fi
1719
1730
RUN chmod +x /tini
1720
1731
ENTRYPOINT ["/tini", "--"]
1721
1732
Original file line number Diff line number Diff line change @@ -1599,10 +1599,21 @@ FROM --platform=linux/$ARCH setup_mig_configs AS start_mig
1599
1599
ARG DOMAIN
1600
1600
1601
1601
# Reap defuncted/orphaned processes
1602
- # IMPORTANT: always verify tini gpg signature and use checksum in download here
1602
+ # IMPORTANT: always verify gpg signature / use verified checksum in downloads!
1603
1603
ARG TINI_VERSION=v0.18.0
1604
1604
ARG TINI_CHECKSUM=sha256:12d20136605531b09a2c2dac02ccee85e1b874eb322ef6baf7561cd93f93c855
1605
- ADD --checksum=${TINI_CHECKSUM} https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
1605
+ ARG TINI_GPG_KEY=0527A9B7
1606
+ # NOTE: hadolint awaits https://github.com/hadolint/language-docker/pull/92 in
1607
+ # an actual release so it will currectly fail hard on the checksum arg.
1608
+ # Rely solely on explicit gpg signature verification for the time being.
1609
+ #ADD --checksum=${TINI_CHECKSUM} https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
1610
+ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
1611
+ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc /tini.asc
1612
+ RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys ${TINI_GPG_KEY} \
1613
+ && if ! gpg --verify /tini.asc /tini ; then \
1614
+ echo "FATAL: failed to verify tini binary"; \
1615
+ exit 1 ; \
1616
+ fi
1606
1617
RUN chmod +x /tini
1607
1618
ENTRYPOINT ["/tini", "--"]
1608
1619
You can’t perform that action at this time.
0 commit comments