Skip to content

Commit 1b96f4d

Browse files
authored
Merge pull request #71 from linuxserver/3.18
2 parents 2e780ea + 98a05af commit 1b96f4d

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:3.17
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.18
44

55
# set version label
66
ARG BUILD_DATE
@@ -12,8 +12,7 @@ LABEL maintainer="saarg"
1212
RUN \
1313
echo "**** install build packages ****" && \
1414
apk add --no-cache --virtual=build-dependencies \
15-
gcc \
16-
make \
15+
build-base \
1716
wget && \
1817
echo "**** install runtime packages ****" && \
1918
apk add --no-cache \
@@ -23,7 +22,8 @@ RUN \
2322
perl-digest-sha1 \
2423
perl-io-socket-inet6 \
2524
perl-io-socket-ssl \
26-
perl-json && \
25+
perl-json \
26+
perl-netaddr-ip && \
2727
echo "***** install perl modules ****" && \
2828
curl -L http://cpanmin.us | perl - App::cpanminus && \
2929
cpanm \

Dockerfile.aarch64

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
44

55
# set version label
66
ARG BUILD_DATE
@@ -12,8 +12,7 @@ LABEL maintainer="saarg"
1212
RUN \
1313
echo "**** install build packages ****" && \
1414
apk add --no-cache --virtual=build-dependencies \
15-
gcc \
16-
make \
15+
build-base \
1716
wget && \
1817
echo "**** install runtime packages ****" && \
1918
apk add --no-cache \
@@ -23,7 +22,8 @@ RUN \
2322
perl-digest-sha1 \
2423
perl-io-socket-inet6 \
2524
perl-io-socket-ssl \
26-
perl-json && \
25+
perl-json \
26+
perl-netaddr-ip && \
2727
echo "***** install perl modules ****" && \
2828
curl -L http://cpanmin.us | perl - App::cpanminus && \
2929
cpanm \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
224224

225225
## Versions
226226

227+
* **25.08.23:** - Rebase to Alpine 3.18.
227228
* **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
228229
* **13.02.23:** - Rebase to Alpine 3.17, migrate to s6v3.
229230
* **20.10.22:** - Update build instructions for 3.10.0. Update default `ddclient.conf`.

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ app_setup_block: |
4545
````
4646
# changelog
4747
changelogs:
48+
- {date: "25.08.23:", desc: "Rebase to Alpine 3.18."}
4849
- {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
4950
- {date: "13.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3."}
5051
- {date: "20.10.22:", desc: "Update build instructions for 3.10.0. Update default `ddclient.conf`."}

0 commit comments

Comments
 (0)