Skip to content

Commit 9c895df

Browse files
craignujcraignuj
authored
Merge pull request #8 from NujSuper/master
Master
2 parents a5447d5 + e97a8ee commit 9c895df

7 files changed

Lines changed: 60 additions & 57 deletions

File tree

‎Dockerfile‎

Lines changed: 2 additions & 2 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.22
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.23
44

55
# set version label
66
ARG BUILD_DATE
@@ -18,7 +18,7 @@ RUN \
1818
sudo && \
1919
echo "**** install openssh-server ****" && \
2020
if [ -z ${OPENSSH_RELEASE+x} ]; then \
21-
OPENSSH_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp && \
21+
OPENSSH_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.23/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp && \
2222
awk '/^P:openssh-server-pam$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
2323
fi && \
2424
apk add --no-cache \

‎Dockerfile.aarch64‎

Lines changed: 2 additions & 2 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.22
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.23
44

55
# set version label
66
ARG BUILD_DATE
@@ -18,7 +18,7 @@ RUN \
1818
sudo && \
1919
echo "**** install openssh-server ****" && \
2020
if [ -z ${OPENSSH_RELEASE+x} ]; then \
21-
OPENSSH_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && \
21+
OPENSSH_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.23/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && \
2222
awk '/^P:openssh-server-pam$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
2323
fi && \
2424
apk add --no-cache \

‎Jenkinsfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pipeline {
2727
DEV_DOCKERHUB_IMAGE = 'lsiodev/openssh-server'
2828
PR_DOCKERHUB_IMAGE = 'lspipepr/openssh-server'
2929
DIST_IMAGE = 'alpine'
30-
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.22/main/'
30+
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.23/main/'
3131
DIST_REPO_PACKAGES = 'openssh-server-pam'
3232
MULTIARCH='true'
3333
CI='true'
@@ -286,7 +286,7 @@ pipeline {
286286
-v ${WORKSPACE}:/mnt \
287287
-e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
288288
-e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
289-
ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
289+
ghcr.io/linuxserver/baseimage-alpine:3.23 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
290290
apk add --no-cache python3 && \
291291
python3 -m venv /lsiopy && \
292292
pip install --no-cache-dir -U pip && \

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ The keys generated by this script are only displayed on your console output, so
9595
To help you get started creating a container from this image you can either use docker-compose or the docker cli.
9696

9797
>[!NOTE]
98-
>Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided.
98+
>Unless a parameter is flagged as 'optional', it is *mandatory* and a value must be provided.
9999
100100
### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
101101

@@ -337,6 +337,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
337337

338338
## Versions
339339

340+
* **28.12.25:** - Rebase to Alpine 3.23.
340341
* **05.07.25:** - Rebase to Alpine 3.22.
341342
* **10.02.25:** - Add support for sshd_config.d
342343
* **12.01.25:** - Rebase to Alpine 3.21.

‎jenkins-vars.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repo_vars:
1515
- DEV_DOCKERHUB_IMAGE = 'lsiodev/openssh-server'
1616
- PR_DOCKERHUB_IMAGE = 'lspipepr/openssh-server'
1717
- DIST_IMAGE = 'alpine'
18-
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.22/main/'
18+
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.23/main/'
1919
- DIST_REPO_PACKAGES = 'openssh-server-pam'
2020
- MULTIARCH='true'
2121
- CI='true'

‎package_versions.txt‎

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,64 @@
11
NAME VERSION TYPE
22
acl-libs 2.3.2-r1 apk
3-
alpine-baselayout 3.7.0-r0 apk
4-
alpine-baselayout-data 3.7.0-r0 apk
5-
alpine-keys 2.5-r0 apk
6-
alpine-release 3.22.2-r0 apk
7-
apk-tools 2.14.9-r3 apk
8-
bash 5.2.37-r0 apk
9-
brotli-libs 1.1.0-r2 apk
10-
busybox 1.37.0-r20 apk
11-
busybox-binsh 1.37.0-r20 apk
12-
c-ares 1.34.5-r0 apk
13-
ca-certificates 20250911-r0 apk
14-
ca-certificates-bundle 20250911-r0 apk
3+
alpine-baselayout 3.7.1-r8 apk
4+
alpine-baselayout-data 3.7.1-r8 apk
5+
alpine-keys 2.6-r0 apk
6+
alpine-release 3.23.3-r0 apk
7+
apk-tools 3.0.4-r0 apk
8+
bash 5.3.3-r1 apk
9+
brotli-libs 1.2.0-r0 apk
10+
busybox 1.37.0-r30 apk
11+
busybox-binsh 1.37.0-r30 apk
12+
c-ares 1.34.6-r0 apk
13+
ca-certificates 20251003-r0 apk
14+
ca-certificates-bundle 20251003-r0 apk
1515
catatonit 0.2.1-r0 apk
16-
coreutils 9.7-r1 apk
17-
coreutils-env 9.7-r1 apk
18-
coreutils-fmt 9.7-r1 apk
19-
coreutils-sha512sum 9.7-r1 apk
20-
curl 8.14.1-r2 apk
16+
coreutils 9.8-r1 apk
17+
coreutils-env 9.8-r1 apk
18+
coreutils-fmt 9.8-r1 apk
19+
coreutils-sha512sum 9.8-r1 apk
20+
curl 8.17.0-r1 apk
2121
findutils 4.10.0-r0 apk
2222
jq 1.8.1-r0 apk
23-
libapk2 2.14.9-r3 apk
23+
libapk 3.0.4-r0 apk
2424
libattr 2.5.2-r2 apk
2525
libbsd 0.12.2-r0 apk
26-
libcrypto3 3.5.4-r0 apk
27-
libcurl 8.14.1-r2 apk
28-
libedit 20250104.3.1-r1 apk
29-
libidn2 2.3.7-r0 apk
30-
libintl 0.24.1-r0 apk
26+
libcrypto3 3.5.5-r0 apk
27+
libcurl 8.17.0-r1 apk
28+
libedit 20251016.3.1-r0 apk
29+
libidn2 2.3.8-r0 apk
30+
libintl 0.24.1-r1 apk
3131
libmd 1.1.0-r0 apk
32-
libncursesw 6.5_p20250503-r0 apk
33-
libproc2 4.0.4-r3 apk
32+
libncursesw 6.5_p20251123-r0 apk
33+
libproc2 4.0.5-r0 apk
3434
libpsl 0.21.5-r3 apk
35-
libssl3 3.5.4-r0 apk
36-
libunistring 1.3-r0 apk
37-
linux-pam 1.7.0-r4 apk
38-
logrotate 3.21.0-r1 apk
39-
musl 1.2.5-r10 apk
40-
musl-utils 1.2.5-r10 apk
41-
nano 8.4-r0 apk
42-
ncurses-terminfo-base 6.5_p20250503-r0 apk
43-
netcat-openbsd 1.229.1-r0 apk
44-
nghttp2-libs 1.65.0-r0 apk
35+
libssl3 3.5.5-r0 apk
36+
libunistring 1.4.1-r0 apk
37+
linux-pam 1.7.1-r2 apk
38+
logrotate 3.22.0-r0 apk
39+
musl 1.2.5-r21 apk
40+
musl-utils 1.2.5-r21 apk
41+
nano 8.7-r0 apk
42+
ncurses-terminfo-base 6.5_p20251123-r0 apk
43+
netcat-openbsd 1.234.1-r0 apk
44+
nghttp2-libs 1.68.0-r0 apk
45+
nghttp3 1.13.1-r0 apk
4546
oniguruma 6.9.10-r0 apk
46-
openssh-client-common 10.0_p1-r9 apk
47-
openssh-client-default 10.0_p1-r9 apk
48-
openssh-keygen 10.0_p1-r9 apk
49-
openssh-server-common 10.0_p1-r9 apk
50-
openssh-server-pam 10.0_p1-r9 apk
51-
openssh-sftp-server 10.0_p1-r9 apk
47+
openssh-client-common 10.2_p1-r0 apk
48+
openssh-client-default 10.2_p1-r0 apk
49+
openssh-keygen 10.2_p1-r0 apk
50+
openssh-server-common 10.2_p1-r0 apk
51+
openssh-server-pam 10.2_p1-r0 apk
52+
openssh-sftp-server 10.2_p1-r0 apk
5253
popt 1.19-r4 apk
53-
procps-ng 4.0.4-r3 apk
54-
readline 8.2.13-r1 apk
55-
scanelf 1.3.8-r1 apk
56-
shadow 4.17.3-r0 apk
54+
procps-ng 4.0.5-r0 apk
55+
readline 8.3.1-r0 apk
56+
scanelf 1.3.8-r2 apk
57+
shadow 4.18.0-r0 apk
5758
skalibs-libs 2.14.4.0-r0 apk
58-
ssl_client 1.37.0-r20 apk
59+
ssl_client 1.37.0-r30 apk
5960
sudo 1.9.17_p2-r0 apk
60-
tzdata 2025b-r0 apk
61+
tzdata 2025c-r0 apk
6162
utmps-libs 0.1.3.1-r0 apk
6263
zlib 1.3.1-r2 apk
63-
zstd-libs 1.5.7-r0 apk
64+
zstd-libs 1.5.7-r2 apk

‎readme-vars.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,12 @@ init_diagram: |
112112
svc-openssh-server -> legacy-services
113113
}
114114
Base Images: {
115-
"baseimage-alpine:3.22"
115+
"baseimage-alpine:3.23"
116116
}
117117
"openssh-server:latest" <- Base Images
118118
# changelog
119119
changelogs:
120+
- {date: "28.12.25:", desc: "Rebase to Alpine 3.23."}
120121
- {date: "05.07.25:", desc: "Rebase to Alpine 3.22."}
121122
- {date: "10.02.25:", desc: "Add support for sshd_config.d"}
122123
- {date: "12.01.25:", desc: "Rebase to Alpine 3.21."}

0 commit comments

Comments
 (0)