Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 0174c7d

Browse files
waybackarchiverwaybackarchiver
committedDec 4, 2021
Upgrade base image to Alpine 3.15
1 parent 553b03e commit 0174c7d

File tree

3 files changed

+31
-24
lines changed

3 files changed

+31
-24
lines changed
 

‎Dockerfile

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN --mount=type=bind,target=/src,rw \
1818
&& mv ./build/binary/wayback-* /wayback
1919

2020
# Application layer
21-
FROM alpine:3.13
21+
FROM alpine:3.15
2222

2323
LABEL org.wabarc.homepage="http://github.com/wabarc" \
2424
org.wabarc.repository="http://github.com/wabarc/wayback" \
@@ -69,17 +69,17 @@ EXPOSE 8964
6969
# add flag `--format=docker` if using podman.
7070
# Ref: https://wiki.alpinelinux.org/wiki/Fonts
7171
ONBUILD RUN set -o pipefail; \
72-
echo @edge https://dl-cdn.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories; \
73-
echo @edge https://dl-cdn.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories; \
72+
echo @v3.15 https://dl-cdn.alpinelinux.org/alpine/v3.15/community >> /etc/apk/repositories; \
73+
echo @v3.15 https://dl-cdn.alpinelinux.org/alpine/v3.15/main >> /etc/apk/repositories; \
7474
apk add --no-cache -U \
75-
chromium@edge \
75+
chromium@v3.15 \
7676
dbus \
7777
dumb-init \
78-
ffmpeg@edge \
79-
freetype@edge \
78+
ffmpeg@v3.15 \
79+
freetype@v3.15 \
8080
libstdc++ \
81-
harfbuzz@edge \
82-
nss@edge \
81+
harfbuzz@v3.15 \
82+
nss@v3.15 \
8383
you-get \
8484
rtmpdump \
8585
youtube-dl \

‎build/docker/Dockerfile.all

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN --mount=type=bind,target=/src,rw \
1818
&& mv ./build/binary/wayback-* /wayback
1919

2020
# Application layer
21-
FROM alpine:3.13
21+
FROM alpine:3.15
2222

2323
LABEL org.wabarc.homepage="http://github.com/wabarc" \
2424
org.wabarc.repository="http://github.com/wabarc/wayback" \
@@ -65,17 +65,17 @@ RUN set -o pipefail; \
6565

6666
# Ref: https://wiki.alpinelinux.org/wiki/Fonts
6767
RUN set -o pipefail; \
68-
echo @edge https://dl-cdn.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories; \
69-
echo @edge https://dl-cdn.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories; \
68+
echo @v3.15 https://dl-cdn.alpinelinux.org/alpine/v3.15/community >> /etc/apk/repositories; \
69+
echo @v3.15 https://dl-cdn.alpinelinux.org/alpine/v3.15/main >> /etc/apk/repositories; \
7070
apk add --no-cache -U \
71-
chromium@edge \
71+
chromium@v3.15 \
7272
dbus \
7373
dumb-init \
74-
ffmpeg@edge \
75-
freetype@edge \
74+
ffmpeg@v3.15 \
75+
freetype@v3.15 \
7676
libstdc++ \
77-
harfbuzz@edge \
78-
nss@edge \
77+
harfbuzz@v3.15 \
78+
nss@v3.15 \
7979
you-get \
8080
rtmpdump \
8181
youtube-dl \

‎build/docker/Dockerfile.dev

+15-8
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,15 @@ RUN set -eu && \
1515
&& mv ./build/binary/wayback-* /wayback
1616

1717
# Application layer
18-
FROM alpine:3.13
18+
FROM alpine:3.15
1919

2020
LABEL org.wabarc.homepage="http://github.com/wabarc" \
21-
org.wabarc.repository="http://github.com/wabarc/wayback"
21+
org.wabarc.repository="http://github.com/wabarc/wayback" \
22+
org.opencontainers.image.title=wayback \
23+
org.opencontainers.image.description="A toolkit for snapshot webpage to Internet Archive, archive.today, IPFS and beyond" \
24+
org.opencontainers.image.url=https://wabarc.eu.org \
25+
org.opencontainers.image.licenses=GPLv3 \
26+
org.opencontainers.image.source="https://github.com/wabarc/wayback"
2227

2328
ARG TOR_EXCLUDE_NODE="{cn},{hk},{mo},{sg},{th},{pk},{by},{ru},{ir},{sy},{vn},{ph},{my},{cu}"
2429
ARG TOR_EXCLUDE_EXIT_NODE="{cn},{hk},{mo},{sg},{kp},{th},{pk},{by},{ru},{ir},{sy},{vn},{ph},{my},{cu},{au},{ca},{nz},{gb},{us},{fr},{dk},{nl},{no},{be},{de},{it},{es}"
@@ -57,19 +62,21 @@ RUN set -o pipefail; \
5762

5863
EXPOSE 8964
5964

65+
# Ref: https://wiki.alpinelinux.org/wiki/Fonts
6066
# Trigger on downstream build, only support for docker,
6167
# add flag `--format=docker` if using podman.
62-
# Ref: https://wiki.alpinelinux.org/wiki/Fonts
6368
ONBUILD RUN set -o pipefail; \
69+
echo @v3.15 https://dl-cdn.alpinelinux.org/alpine/v3.15/community >> /etc/apk/repositories; \
70+
echo @v3.15 https://dl-cdn.alpinelinux.org/alpine/v3.15/main >> /etc/apk/repositories; \
6471
apk add --no-cache -U \
65-
chromium \
72+
chromium@v3.15 \
6673
dbus \
6774
dumb-init \
68-
ffmpeg \
69-
freetype \
75+
ffmpeg@v3.15 \
76+
freetype@v3.15 \
7077
libstdc++ \
71-
harfbuzz \
72-
nss \
78+
harfbuzz@v3.15 \
79+
nss@v3.15 \
7380
you-get \
7481
rtmpdump \
7582
youtube-dl \

0 commit comments

Comments
 (0)
Failed to load comments.