Skip to content

Commit bb880c5

Browse files
authored
Merge pull request #115 from linuxserver/3.23
2 parents dafabc2 + db65571 commit bb880c5

File tree

7 files changed

+10
-8
lines changed

7 files changed

+10
-8
lines changed

.github/workflows/external_trigger.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
3030
echo "> External trigger running off of master branch. To disable this trigger, add \`openssh-server_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
3131
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
32-
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
32+
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.23/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
3333
&& awk '/^P:'"openssh-server-pam"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
3434
echo "Type is \`alpine_repo\`" >> $GITHUB_STEP_SUMMARY
3535
if grep -q "^openssh-server_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
@@ -107,7 +107,7 @@ jobs:
107107
if [ "${EXT_RELEASE_SANITIZED}" == "${IMAGE_VERSION}" ]; then
108108
echo "Sanitized version \`${EXT_RELEASE_SANITIZED}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
109109
exit 0
110-
elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"openssh-server-pam"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
110+
elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.23/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"openssh-server-pam"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
111111
echo "New version \`${EXT_RELEASE}\` found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
112112
FAILURE_REASON="New version ${EXT_RELEASE} for openssh-server tag latest is detected, however not all arch repos are updated yet. Will try again later."
113113
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,

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: 1 addition & 1 deletion
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'

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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'

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ init_diagram: |
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)