Skip to content

Commit 94a27ac

Browse files
thresheekthresheek
committed
Fixed failure to build packages from source on recent Alpine versions
apk index no longer accepts untrusted keys since 2.14.2
1 parent 3180cdb commit 94a27ac

File tree

12 files changed

+12
-12
lines changed

12 files changed

+12
-12
lines changed

‎Dockerfile-alpine-otel.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ RUN set -x \
5050
&& cd pkg-oss-%%REVISION%% \
5151
&& cd alpine \
5252
&& make %%BUILDTARGET%% \
53-
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
53+
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
5454
&& abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
5555
" \
5656
&& cp ${tempDir}/.abuild/abuild-key.rsa.pub /etc/apk/keys/ \

‎Dockerfile-alpine-perl.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN set -x \
4545
&& cd pkg-oss-%%REVISION%% \
4646
&& cd alpine \
4747
&& make %%BUILDTARGET%% \
48-
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
48+
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
4949
&& abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
5050
" \
5151
&& cp ${tempDir}/.abuild/abuild-key.rsa.pub /etc/apk/keys/ \

‎Dockerfile-alpine-slim.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN set -x \
6262
&& cd pkg-oss-%%REVISION%% \
6363
&& cd alpine \
6464
&& make %%BUILDTARGET%% \
65-
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
65+
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
6666
&& abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
6767
" \
6868
&& cp ${tempDir}/.abuild/abuild-key.rsa.pub /etc/apk/keys/ \

‎Dockerfile-alpine.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN set -x \
5151
&& cd pkg-oss-%%REVISION%% \
5252
&& cd alpine \
5353
&& make %%BUILDTARGET%% \
54-
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
54+
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
5555
&& abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
5656
" \
5757
&& cp ${tempDir}/.abuild/abuild-key.rsa.pub /etc/apk/keys/ \

‎mainline/alpine-otel/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RUN set -x \
6161
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6262
&& cd alpine \
6363
&& make module-otel \
64-
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
64+
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
6565
&& abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
6666
" \
6767
&& cp ${tempDir}/.abuild/abuild-key.rsa.pub /etc/apk/keys/ \

‎mainline/alpine-perl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ RUN set -x \
5656
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
5757
&& cd alpine \
5858
&& make module-perl \
59-
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
59+
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
6060
&& abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
6161
" \
6262
&& cp ${tempDir}/.abuild/abuild-key.rsa.pub /etc/apk/keys/ \

‎mainline/alpine-slim/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ RUN set -x \
6868
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6969
&& cd alpine \
7070
&& make base \
71-
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
71+
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
7272
&& abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
7373
" \
7474
&& cp ${tempDir}/.abuild/abuild-key.rsa.pub /etc/apk/keys/ \

‎mainline/alpine/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RUN set -x \
6161
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6262
&& cd alpine \
6363
&& make module-geoip module-image-filter module-njs module-xslt \
64-
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
64+
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
6565
&& abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
6666
" \
6767
&& cp ${tempDir}/.abuild/abuild-key.rsa.pub /etc/apk/keys/ \

‎stable/alpine-otel/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RUN set -x \
6161
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6262
&& cd alpine \
6363
&& make module-otel \
64-
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
64+
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
6565
&& abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
6666
" \
6767
&& cp ${tempDir}/.abuild/abuild-key.rsa.pub /etc/apk/keys/ \

‎stable/alpine-perl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ RUN set -x \
5656
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
5757
&& cd alpine \
5858
&& make module-perl \
59-
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
59+
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
6060
&& abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
6161
" \
6262
&& cp ${tempDir}/.abuild/abuild-key.rsa.pub /etc/apk/keys/ \

‎stable/alpine-slim/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ RUN set -x \
6868
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6969
&& cd alpine \
7070
&& make base \
71-
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
71+
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
7272
&& abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
7373
" \
7474
&& cp ${tempDir}/.abuild/abuild-key.rsa.pub /etc/apk/keys/ \

‎stable/alpine/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RUN set -x \
6161
&& cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
6262
&& cd alpine \
6363
&& make module-geoip module-image-filter module-njs module-xslt \
64-
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
64+
&& apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
6565
&& abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
6666
" \
6767
&& cp ${tempDir}/.abuild/abuild-key.rsa.pub /etc/apk/keys/ \

0 commit comments

Comments
 (0)