LAB-linuxserver/docker-openssh-server
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-openssh-server.git synced 2026-02-20 04:33:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #84 from linuxserver/3.19

Browse Source 
rebase to alpine 3.19
This commit is contained in:
aptalca 2024-03-09 15:22:30 -05:00 committed by GitHub
commit d6c78a08b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/external_trigger.yml vendored
View File

@ -20,7 +20,7 @@ jobs:
echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_OPENSSH_SERVER_MASTER\". ****"
echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_OPENSSH_SERVER_MASTER\`" >> $GITHUB_STEP_SUMMARY
echo "**** Retrieving external version ****"
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
&& awk '/^P:'"openssh-server-pam"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
echo "**** Can't retrieve external version, exiting ****"
@ -74,7 +74,7 @@ jobs:
echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
exit 0
elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/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
elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/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
echo "**** New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting ****"
echo "New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
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."

4
Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:3.18
FROM ghcr.io/linuxserver/baseimage-alpine:3.19
# set version label
ARG BUILD_DATE
@ -18,7 +18,7 @@ RUN \
sudo && \
echo "**** install openssh-server ****" && \
if [ -z ${OPENSSH_RELEASE+x} ]; then \
OPENSSH_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp && \
OPENSSH_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp && \
awk '/^P:openssh-server-pam$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
fi && \
apk add --no-cache \

4
Dockerfile.aarch64
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
# set version label
ARG BUILD_DATE
@ -18,7 +18,7 @@ RUN \
sudo && \
echo "**** install openssh-server ****" && \
if [ -z ${OPENSSH_RELEASE+x} ]; then \
OPENSSH_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && \
OPENSSH_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && \
awk '/^P:openssh-server-pam$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
fi && \
apk add --no-cache \

2
Jenkinsfile vendored
View File

@ -26,7 +26,7 @@ pipeline {
PR_DOCKERHUB_IMAGE = 'lspipepr/openssh-server'
DIST_IMAGE = 'alpine'
DIST_TAG = '3.18'
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/main/'
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/main/'
DIST_REPO_PACKAGES = 'openssh-server-pam'
MULTIARCH='true'
CI='true'

1
README.md
View File

@ -336,6 +336,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **09.03.24:** - Rebase to Alpine 3.19.
* **12.06.23:** - Rebase to Alpine 3.18, deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
* **05.03.23:** - Rebase to Alpine 3.17.
* **18.10.22:** - Fix wrong behavior of password/passwordless sudo

2
jenkins-vars.yml
View File

@ -17,7 +17,7 @@ repo_vars:
- PR_DOCKERHUB_IMAGE = 'lspipepr/openssh-server'
- DIST_IMAGE = 'alpine'
- DIST_TAG = '3.18'
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/main/'
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/main/'
- DIST_REPO_PACKAGES = 'openssh-server-pam'
- MULTIARCH='true'
- CI='true'

1
readme-vars.yml
View File

@ -76,6 +76,7 @@ app_setup_block: |
The keys generated by this script are only displayed on your console output, so make sure to save them somewhere after generation.
# changelog
changelogs:
- {date: "09.03.24:", desc: "Rebase to Alpine 3.19."}
- {date: "12.06.23:", desc: "Rebase to Alpine 3.18, deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
- {date: "05.03.23:", desc: "Rebase to Alpine 3.17."}
- {date: "18.10.22:", desc: "Fix wrong behavior of password/passwordless sudo"}