Skip to content

Commit 328e0f3

Browse files
committed
Alpine: don't depend on mercurial to fetch packaging sources.
Alpine doesnt ship mercurial package on x86.
1 parent 7be6b74 commit 328e0f3

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

Dockerfile-alpine.template

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,15 @@ RUN set -x \
5050
geoip-dev \
5151
perl-dev \
5252
libedit-dev \
53-
mercurial \
5453
bash \
5554
alpine-sdk \
5655
findutils \
5756
&& su nobody -s /bin/sh -c " \
5857
export HOME=${tempDir} \
5958
&& cd ${tempDir} \
60-
&& hg clone https://hg.nginx.org/pkg-oss \
61-
&& cd pkg-oss \
62-
&& hg up %%REVISION%% \
59+
&& curl -O https://hg.nginx.org/pkg-oss/archive/%%REVISION%%.tar.gz \
60+
&& tar xzvf %%REVISION%%.tar.gz \
61+
&& cd pkg-oss-%%REVISION%% \
6362
&& cd alpine \
6463
&& make all \
6564
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ declare -A alpine=(
3939
# when building alpine packages on architectures not supported by nginx.org
4040
defaultrev='${NGINX_VERSION}-${PKG_RELEASE}'
4141
declare -A rev=(
42-
#[stable]='-r 500'
42+
#[stable]='500'
4343
)
4444

4545
get_packages() {

0 commit comments

Comments
 (0)