Skip to content

Commit f1340af

Browse files
trnubotrnubo
committed
Upgrade s6 and gomplate, remove .s6-svscan directories
1 parent 34457a7 commit f1340af

12 files changed

Lines changed: 184 additions & 74 deletions

File tree

‎centos7-develop/Dockerfile‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
FROM centos:7
99

10-
ENV S6_RELEASE=1.20.0 S6_VERSION=2.5.1.0 S6_SHA1=b798972cbf46e28f1c5d238f6703aba6edded57e
1110
ENV VOLTGRID_PIE=1.0.8 VOLTGRID_PIE_SHA1=c25926d4ac22ed7963f23463334bfac8e2d5e85f
1211

1312
# Fix the timezone to UTC
@@ -51,11 +50,32 @@ RUN DIR=$(mktemp -d) && cd ${DIR} && \
5150
echo '{"user":{"uid":0,"gid":0}}' > /usr/local/etc/voltgrid.conf
5251

5352
# Install s6
54-
RUN DIR=$(mktemp -d) && cd ${DIR} && \
55-
curl -s -L https://github.com/just-containers/skaware/releases/download/v${S6_RELEASE}/s6-${S6_VERSION}-linux-amd64-bin.tar.gz -o s6.tar.gz && \
56-
echo "${S6_SHA1} s6.tar.gz" | sha1sum -c - && \
57-
tar -xzf s6.tar.gz -C /usr/local/ && \
58-
rm -rf ${DIR}
53+
RUN set -x \
54+
&& S6_VERSION=2.11.0.0 \
55+
&& EXECLINE_VERSION=2.8.1.0 \
56+
&& SKAWARE_RELEASE=2.0.7 \
57+
&& S6_CHECKSUM_X86_64=fcf79204c1957016fc88b0ad7d98f150071483583552103d5822cbf56824cc87 \
58+
&& S6_CHECKSUM_AARCH64=64151e136f887c6c2c7df69e3100573c318ec7400296680cc698bc7b0ca36943 \
59+
&& EXECLINE_CHECKSUM_X86_64=b216cfc4db928729d950df5a354aa34bc529e8250b55ab0de700193693dea682 \
60+
&& EXECLINE_CHECKSUM_AARCH64=8cb1d5c2d44cb94990d63023db48f7d3cd71ead10cbb19c05b99dbd528af5748 \
61+
&& if [ "$(uname -m)" = "x86_64" ] ; then \
62+
S6_CHECKSUM="${S6_CHECKSUM_X86_64}"; \
63+
EXECLINE_CHECKSUM="${EXECLINE_CHECKSUM_X86_64}"; \
64+
SKAWARE_ARCH="amd64"; \
65+
elif [ "$(uname -m)" = "aarch64" ]; then \
66+
S6_CHECKSUM="${S6_CHECKSUM_AARCH64}"; \
67+
EXECLINE_CHECKSUM="${EXECLINE_CHECKSUM_AARCH64}"; \
68+
SKAWARE_ARCH="aarch64"; \
69+
fi \
70+
&& curl -sSf -L -o /tmp/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz https://github.com/just-containers/skaware/releases/download/v${SKAWARE_RELEASE}/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
71+
&& curl -sSf -L -o /tmp/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz https://github.com/just-containers/skaware/releases/download/v${SKAWARE_RELEASE}/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
72+
&& echo "${S6_CHECKSUM} s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz" > /tmp/SHA256SUM \
73+
&& echo "${EXECLINE_CHECKSUM} execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz" >> /tmp/SHA256SUM \
74+
&& ( cd /tmp; sha256sum -c SHA256SUM || ( echo "Expected S6: $(sha256sum s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz) Execline: $(sha256sum execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz)"; exit 1; )) \
75+
&& tar -C /usr/local -zxf /tmp/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
76+
&& tar -C /usr/local -zxf /tmp/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
77+
&& rm -rf /tmp/* \
78+
;
5979

6080
COPY conf.modules.d /etc/httpd/conf.modules.d
6181
COPY conf.d /etc/httpd/conf.d

‎centos7-develop/s6/.s6-svscan/finish‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎centos7/Dockerfile‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
FROM centos:7
99

10-
ENV S6_RELEASE=1.20.0 S6_VERSION=2.5.1.0 S6_SHA1=b798972cbf46e28f1c5d238f6703aba6edded57e
1110
ENV VOLTGRID_PIE=1.0.8 VOLTGRID_PIE_SHA1=c25926d4ac22ed7963f23463334bfac8e2d5e85f
1211

1312
# Fix the timezone to UTC
@@ -51,11 +50,32 @@ RUN DIR=$(mktemp -d) && cd ${DIR} && \
5150
echo '{"user":{"uid":0,"gid":0}}' > /usr/local/etc/voltgrid.conf
5251

5352
# Install s6
54-
RUN DIR=$(mktemp -d) && cd ${DIR} && \
55-
curl -s -L https://github.com/just-containers/skaware/releases/download/v${S6_RELEASE}/s6-${S6_VERSION}-linux-amd64-bin.tar.gz -o s6.tar.gz && \
56-
echo "${S6_SHA1} s6.tar.gz" | sha1sum -c - && \
57-
tar -xzf s6.tar.gz -C /usr/local/ && \
58-
rm -rf ${DIR}
53+
RUN set -x \
54+
&& S6_VERSION=2.11.0.0 \
55+
&& EXECLINE_VERSION=2.8.1.0 \
56+
&& SKAWARE_RELEASE=2.0.7 \
57+
&& S6_CHECKSUM_X86_64=fcf79204c1957016fc88b0ad7d98f150071483583552103d5822cbf56824cc87 \
58+
&& S6_CHECKSUM_AARCH64=64151e136f887c6c2c7df69e3100573c318ec7400296680cc698bc7b0ca36943 \
59+
&& EXECLINE_CHECKSUM_X86_64=b216cfc4db928729d950df5a354aa34bc529e8250b55ab0de700193693dea682 \
60+
&& EXECLINE_CHECKSUM_AARCH64=8cb1d5c2d44cb94990d63023db48f7d3cd71ead10cbb19c05b99dbd528af5748 \
61+
&& if [ "$(uname -m)" = "x86_64" ] ; then \
62+
S6_CHECKSUM="${S6_CHECKSUM_X86_64}"; \
63+
EXECLINE_CHECKSUM="${EXECLINE_CHECKSUM_X86_64}"; \
64+
SKAWARE_ARCH="amd64"; \
65+
elif [ "$(uname -m)" = "aarch64" ]; then \
66+
S6_CHECKSUM="${S6_CHECKSUM_AARCH64}"; \
67+
EXECLINE_CHECKSUM="${EXECLINE_CHECKSUM_AARCH64}"; \
68+
SKAWARE_ARCH="aarch64"; \
69+
fi \
70+
&& curl -sSf -L -o /tmp/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz https://github.com/just-containers/skaware/releases/download/v${SKAWARE_RELEASE}/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
71+
&& curl -sSf -L -o /tmp/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz https://github.com/just-containers/skaware/releases/download/v${SKAWARE_RELEASE}/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
72+
&& echo "${S6_CHECKSUM} s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz" > /tmp/SHA256SUM \
73+
&& echo "${EXECLINE_CHECKSUM} execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz" >> /tmp/SHA256SUM \
74+
&& ( cd /tmp; sha256sum -c SHA256SUM || ( echo "Expected S6: $(sha256sum s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz) Execline: $(sha256sum execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz)"; exit 1; )) \
75+
&& tar -C /usr/local -zxf /tmp/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
76+
&& tar -C /usr/local -zxf /tmp/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
77+
&& rm -rf /tmp/* \
78+
;
5979

6080
# ImageTragick CVE-2016-3714
6181
COPY policy.xml /etc/ImageMagick/policy.xml

‎centos7/s6/.s6-svscan/finish‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎debian10/Dockerfile‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
FROM debian:10
1010

11-
ENV S6_RELEASE=1.20.0 S6_VERSION=2.5.1.0 S6_SHA1=b798972cbf46e28f1c5d238f6703aba6edded57e
1211
ENV VOLTGRID_PIE=1.0.8 VOLTGRID_PIE_SHA1=c25926d4ac22ed7963f23463334bfac8e2d5e85f
1312

1413
# Change the www-data user to uid and gid 48 to match other containers
@@ -55,11 +54,32 @@ RUN DIR=$(mktemp -d) && cd ${DIR} && \
5554
echo '{"user":{"uid":0,"gid":0}}' > /usr/local/etc/voltgrid.conf
5655

5756
# Install s6
58-
RUN DIR=$(mktemp -d) && cd ${DIR} && \
59-
curl -s -L https://github.com/just-containers/skaware/releases/download/v${S6_RELEASE}/s6-${S6_VERSION}-linux-amd64-bin.tar.gz -o s6.tar.gz && \
60-
echo "${S6_SHA1} s6.tar.gz" | sha1sum -c - && \
61-
tar -xzf s6.tar.gz -C /usr/local/ && \
62-
rm -rf ${DIR}
57+
RUN set -x \
58+
&& S6_VERSION=2.11.0.0 \
59+
&& EXECLINE_VERSION=2.8.1.0 \
60+
&& SKAWARE_RELEASE=2.0.7 \
61+
&& S6_CHECKSUM_X86_64=fcf79204c1957016fc88b0ad7d98f150071483583552103d5822cbf56824cc87 \
62+
&& S6_CHECKSUM_AARCH64=64151e136f887c6c2c7df69e3100573c318ec7400296680cc698bc7b0ca36943 \
63+
&& EXECLINE_CHECKSUM_X86_64=b216cfc4db928729d950df5a354aa34bc529e8250b55ab0de700193693dea682 \
64+
&& EXECLINE_CHECKSUM_AARCH64=8cb1d5c2d44cb94990d63023db48f7d3cd71ead10cbb19c05b99dbd528af5748 \
65+
&& if [ "$(uname -m)" = "x86_64" ] ; then \
66+
S6_CHECKSUM="${S6_CHECKSUM_X86_64}"; \
67+
EXECLINE_CHECKSUM="${EXECLINE_CHECKSUM_X86_64}"; \
68+
SKAWARE_ARCH="amd64"; \
69+
elif [ "$(uname -m)" = "aarch64" ]; then \
70+
S6_CHECKSUM="${S6_CHECKSUM_AARCH64}"; \
71+
EXECLINE_CHECKSUM="${EXECLINE_CHECKSUM_AARCH64}"; \
72+
SKAWARE_ARCH="aarch64"; \
73+
fi \
74+
&& curl -sSf -L -o /tmp/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz https://github.com/just-containers/skaware/releases/download/v${SKAWARE_RELEASE}/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
75+
&& curl -sSf -L -o /tmp/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz https://github.com/just-containers/skaware/releases/download/v${SKAWARE_RELEASE}/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
76+
&& echo "${S6_CHECKSUM} s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz" > /tmp/SHA256SUM \
77+
&& echo "${EXECLINE_CHECKSUM} execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz" >> /tmp/SHA256SUM \
78+
&& ( cd /tmp; sha256sum -c SHA256SUM || ( echo "Expected S6: $(sha256sum s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz) Execline: $(sha256sum execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz)"; exit 1; )) \
79+
&& tar -C /usr/local -zxf /tmp/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
80+
&& tar -C /usr/local -zxf /tmp/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
81+
&& rm -rf /tmp/* \
82+
;
6383

6484
# Configure
6585
RUN \

‎debian10/s6/.s6-svscan/finish‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎debian11/Dockerfile‎

Lines changed: 40 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ FROM debian:bullseye
1111
# Component Versions
1212
ENV \
1313
BASHCONTAINER_VERSION=0.7.2 BASHCONTAINER_SHA256=87c4b804f0323d8f0856cb4fbf2f7859174765eccc8b0ac2d99b767cecdcf5c6 \
14-
GOMPLATE_VERSION=3.10.0 GOMPLATE_SHA256=603539aac4e09f98a8ca5b6e5da0c21213221206dc7175a5644255c7a22b936d \
15-
S6_RELEASE=2.0.7 S6_VERSION=2.11.0.0 S6_SHA256=fcf79204c1957016fc88b0ad7d98f150071483583552103d5822cbf56824cc87 \
1614
PHPEXTRAS_VERSION=0.1.0 PHPEXTRAS_SHA256=515af5789d5180123acfac9b1090f46e07f355c8df51a34e27ada5f7da0495cc
1715

1816
# Change the www-data use to uid and gid 48 to match other containers
@@ -40,30 +38,50 @@ RUN set -x \
4038

4139
# Install gomplate
4240
RUN set -x \
43-
&& if ! command -v wget > /dev/null; then \
44-
fetchDeps="${fetchDeps} wget"; \
45-
fi \
46-
&& apt-get update \
47-
&& apt-get install -y --no-install-recommends ca-certificates ${fetchDeps} \
48-
&& wget -nv -O /tmp/gomplate_linux-amd64-slim -L https://github.com/hairyhenderson/gomplate/releases/download/v${GOMPLATE_VERSION}/gomplate_linux-amd64-slim \
49-
&& echo "${GOMPLATE_SHA256} gomplate_linux-amd64-slim" > /tmp/SHA256SUM \
50-
&& ( cd /tmp; sha256sum -c SHA256SUM || ( echo "Expected $(sha256sum gomplate_linux-amd64-slim)"; exit 1; )) \
51-
&& mv /tmp/gomplate_linux-amd64-slim /usr/local/bin/gomplate \
52-
&& chmod +x /usr/local/bin/gomplate \
53-
&& rm -rf /tmp/* \
54-
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${fetchDeps} \
55-
&& apt-get clean \
56-
&& rm -rf /var/lib/apt/lists/* \
41+
&& GOMPLATE_VERSION=v3.11.5 \
42+
&& GOMPLATE_CHECKSUM_X86_64=16f6a01a0ff22cae1302980c42ce4f98ca20f8c55443ce5a8e62e37fc23487b3 \
43+
&& GOMPLATE_CHECKSUM_AARCH64=fd980f9d233902e50f3f03f10ea65f36a2705385358a87aa18b19fb7cdf54c1d \
44+
&& if [ "$(uname -m)" = "x86_64" ] ; then \
45+
GOMPLATE_CHECKSUM="${GOMPLATE_CHECKSUM_X86_64}"; \
46+
GOMPLATE_ARCH="amd64"; \
47+
elif [ "$(uname -m)" = "aarch64" ]; then \
48+
GOMPLATE_CHECKSUM="${GOMPLATE_CHECKSUM_AARCH64}"; \
49+
GOMPLATE_ARCH="arm64"; \
50+
fi \
51+
&& curl -sSf -o /tmp/gomplate_linux-${GOMPLATE_ARCH} -L https://github.com/hairyhenderson/gomplate/releases/download/${GOMPLATE_VERSION}/gomplate_linux-${GOMPLATE_ARCH} \
52+
&& echo "${GOMPLATE_CHECKSUM} gomplate_linux-${GOMPLATE_ARCH}" > /tmp/SHA256SUM \
53+
&& ( cd /tmp; sha256sum -c SHA256SUM || ( echo "Expected $(sha256sum gomplate_linux-${GOMPLATE_ARCH})"; exit 1; )) \
54+
&& install -m 0755 /tmp/gomplate_linux-${GOMPLATE_ARCH} /usr/local/bin/gomplate \
55+
&& rm -f /tmp/* \
5756
;
5857

5958
# Install s6
6059
RUN set -x \
61-
&& DIR=$(mktemp -d) && cd ${DIR} \
62-
&& curl -s -L https://github.com/just-containers/skaware/releases/download/v${S6_RELEASE}/s6-${S6_VERSION}-linux-amd64-bin.tar.gz -o s6.tar.gz \
63-
&& echo "${S6_SHA256} s6.tar.gz" > SHA256SUM \
64-
&& ( sha256sum -c SHA256SUM || ( echo "Expected $(sha256sum s6.tar.gz)"; exit 1; )) \
65-
&& tar -xzf s6.tar.gz -C /usr/local/ \
66-
&& rm -rf ${DIR}
60+
&& S6_VERSION=2.11.0.0 \
61+
&& EXECLINE_VERSION=2.8.1.0 \
62+
&& SKAWARE_RELEASE=2.0.7 \
63+
&& S6_CHECKSUM_X86_64=fcf79204c1957016fc88b0ad7d98f150071483583552103d5822cbf56824cc87 \
64+
&& S6_CHECKSUM_AARCH64=64151e136f887c6c2c7df69e3100573c318ec7400296680cc698bc7b0ca36943 \
65+
&& EXECLINE_CHECKSUM_X86_64=b216cfc4db928729d950df5a354aa34bc529e8250b55ab0de700193693dea682 \
66+
&& EXECLINE_CHECKSUM_AARCH64=8cb1d5c2d44cb94990d63023db48f7d3cd71ead10cbb19c05b99dbd528af5748 \
67+
&& if [ "$(uname -m)" = "x86_64" ] ; then \
68+
S6_CHECKSUM="${S6_CHECKSUM_X86_64}"; \
69+
EXECLINE_CHECKSUM="${EXECLINE_CHECKSUM_X86_64}"; \
70+
SKAWARE_ARCH="amd64"; \
71+
elif [ "$(uname -m)" = "aarch64" ]; then \
72+
S6_CHECKSUM="${S6_CHECKSUM_AARCH64}"; \
73+
EXECLINE_CHECKSUM="${EXECLINE_CHECKSUM_AARCH64}"; \
74+
SKAWARE_ARCH="aarch64"; \
75+
fi \
76+
&& curl -sSf -L -o /tmp/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz https://github.com/just-containers/skaware/releases/download/v${SKAWARE_RELEASE}/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
77+
&& curl -sSf -L -o /tmp/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz https://github.com/just-containers/skaware/releases/download/v${SKAWARE_RELEASE}/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
78+
&& echo "${S6_CHECKSUM} s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz" > /tmp/SHA256SUM \
79+
&& echo "${EXECLINE_CHECKSUM} execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz" >> /tmp/SHA256SUM \
80+
&& ( cd /tmp; sha256sum -c SHA256SUM || ( echo "Expected S6: $(sha256sum s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz) Execline: $(sha256sum execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz)"; exit 1; )) \
81+
&& tar -C /usr/local -zxf /tmp/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
82+
&& tar -C /usr/local -zxf /tmp/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
83+
&& rm -rf /tmp/* \
84+
;
6785

6886
# Install PHP Extras
6987
RUN set -x \

‎debian11/etc/s6/.s6-svscan/finish‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎debian9/Dockerfile‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
FROM debian:9
1010

11-
ENV S6_RELEASE=1.20.0 S6_VERSION=2.5.1.0 S6_SHA1=b798972cbf46e28f1c5d238f6703aba6edded57e
1211
ENV VOLTGRID_PIE=1.0.8 VOLTGRID_PIE_SHA1=c25926d4ac22ed7963f23463334bfac8e2d5e85f
1312

1413
# Change the www-data user to uid and gid 48 to match other containers
@@ -33,11 +32,32 @@ RUN DIR=$(mktemp -d) && cd ${DIR} && \
3332
echo '{"user":{"uid":0,"gid":0}}' > /usr/local/etc/voltgrid.conf
3433

3534
# Install s6
36-
RUN DIR=$(mktemp -d) && cd ${DIR} && \
37-
curl -s -L https://github.com/just-containers/skaware/releases/download/v${S6_RELEASE}/s6-${S6_VERSION}-linux-amd64-bin.tar.gz -o s6.tar.gz && \
38-
echo "${S6_SHA1} s6.tar.gz" | sha1sum -c - && \
39-
tar -xzf s6.tar.gz -C /usr/local/ && \
40-
rm -rf ${DIR}
35+
RUN set -x \
36+
&& S6_VERSION=2.11.0.0 \
37+
&& EXECLINE_VERSION=2.8.1.0 \
38+
&& SKAWARE_RELEASE=2.0.7 \
39+
&& S6_CHECKSUM_X86_64=fcf79204c1957016fc88b0ad7d98f150071483583552103d5822cbf56824cc87 \
40+
&& S6_CHECKSUM_AARCH64=64151e136f887c6c2c7df69e3100573c318ec7400296680cc698bc7b0ca36943 \
41+
&& EXECLINE_CHECKSUM_X86_64=b216cfc4db928729d950df5a354aa34bc529e8250b55ab0de700193693dea682 \
42+
&& EXECLINE_CHECKSUM_AARCH64=8cb1d5c2d44cb94990d63023db48f7d3cd71ead10cbb19c05b99dbd528af5748 \
43+
&& if [ "$(uname -m)" = "x86_64" ] ; then \
44+
S6_CHECKSUM="${S6_CHECKSUM_X86_64}"; \
45+
EXECLINE_CHECKSUM="${EXECLINE_CHECKSUM_X86_64}"; \
46+
SKAWARE_ARCH="amd64"; \
47+
elif [ "$(uname -m)" = "aarch64" ]; then \
48+
S6_CHECKSUM="${S6_CHECKSUM_AARCH64}"; \
49+
EXECLINE_CHECKSUM="${EXECLINE_CHECKSUM_AARCH64}"; \
50+
SKAWARE_ARCH="aarch64"; \
51+
fi \
52+
&& curl -sSf -L -o /tmp/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz https://github.com/just-containers/skaware/releases/download/v${SKAWARE_RELEASE}/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
53+
&& curl -sSf -L -o /tmp/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz https://github.com/just-containers/skaware/releases/download/v${SKAWARE_RELEASE}/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
54+
&& echo "${S6_CHECKSUM} s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz" > /tmp/SHA256SUM \
55+
&& echo "${EXECLINE_CHECKSUM} execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz" >> /tmp/SHA256SUM \
56+
&& ( cd /tmp; sha256sum -c SHA256SUM || ( echo "Expected S6: $(sha256sum s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz) Execline: $(sha256sum execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz)"; exit 1; )) \
57+
&& tar -C /usr/local -zxf /tmp/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
58+
&& tar -C /usr/local -zxf /tmp/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
59+
&& rm -rf /tmp/* \
60+
;
4161

4262
# Configure
4363
RUN \

‎debian9/s6/.s6-svscan/finish‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)