From 49477f32140039f643bce652cc2b1c5c326fa581 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Sat, 16 Apr 2022 13:38:16 +0100
Subject: [PATCH] Rebase to alpine 3.15

---
 Dockerfile         | 8 ++++++--
 Dockerfile.aarch64 | 8 ++++++--
 Dockerfile.armhf   | 8 ++++++--
 jenkins-vars.yml   | 4 ++--
 readme-vars.yml    | 6 ++++--
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 75ac526..9f05166 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.14
+FROM ghcr.io/linuxserver/baseimage-alpine:3.15
 
 # set version label
 ARG BUILD_DATE
@@ -16,7 +16,7 @@ RUN \
     sudo && \
   echo "**** install openssh-server ****" && \
   if [ -z ${OPENSSH_RELEASE+x} ]; then \
-    OPENSSH_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp && \
+    OPENSSH_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/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 \
@@ -31,3 +31,7 @@ RUN \
 
 # add local files
 COPY /root /
+
+EXPOSE 2222
+
+VOLUME /config
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index d9b3007..1b4a8cd 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
 
 # set version label
 ARG BUILD_DATE
@@ -16,7 +16,7 @@ RUN \
     sudo && \
   echo "**** install openssh-server ****" && \
   if [ -z ${OPENSSH_RELEASE+x} ]; then \
-    OPENSSH_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && \
+    OPENSSH_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/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 \
@@ -31,3 +31,7 @@ RUN \
 
 # add local files
 COPY /root /
+
+EXPOSE 2222
+
+VOLUME /config
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 156b009..6219933 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
 
 # set version label
 ARG BUILD_DATE
@@ -16,7 +16,7 @@ RUN \
     sudo && \
   echo "**** install openssh-server ****" && \
   if [ -z ${OPENSSH_RELEASE+x} ]; then \
-    OPENSSH_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/main/armhf/APKINDEX.tar.gz" | tar -xz -C /tmp && \
+    OPENSSH_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/main/armhf/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 \
@@ -31,3 +31,7 @@ RUN \
 
 # add local files
 COPY /root /
+
+EXPOSE 2222
+
+VOLUME /config
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 5cedea0..d9fa319 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -15,8 +15,8 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/openssh-server'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/openssh-server'
   - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.14'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/main/'
+  - DIST_TAG = '3.15'
+  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.15/main/'
   - DIST_REPO_PACKAGES = 'openssh-server-pam'
   - MULTIARCH='true'
   - CI='true'
diff --git a/readme-vars.yml b/readme-vars.yml
index 789b5b0..f99f3ad 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -6,9 +6,10 @@ project_url: "https://www.openssh.com/"
 project_logo: "https://upload.wikimedia.org/wikipedia/en/6/65/OpenSSH_logo.png"
 project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a sandboxed environment that allows ssh access without giving keys to the entire server.
 
-Giving ssh access via private key often means giving full access to the server. This container creates a limited and sandboxed environment that others can ssh into.
+  Giving ssh access via private key often means giving full access to the server. This container creates a limited and sandboxed environment that others can ssh into.
 
-The users only have access to the folders mapped and the processes running inside this container."
+  The users only have access to the folders mapped and the processes running inside this container."
+  
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
 
 # supported architectures
@@ -92,6 +93,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "16.04.22:", desc: "Rebase to alpine 3.15."}
   - { date: "16.11.21:", desc: "Add PUBLIC_KEY_URL option"}
   - { date: "28.06.21:", desc: "Rebasing to alpine 3.14. Add support for PAM." }
   - { date: "10.02.21:", desc: "Rebasing to alpine 3.13. Add openssh-client for scp." }