schedule:work now doesnt exit immediately, add wait_for_db for queue

.gitea/workflows/build_docker.yaml

@@ -0,0 +1,190 @@
+name: Create Docker Image
+run-name: ${{ gitea.actor }} Building Docker Image 🐳
+on: [push]
+env:
+  VERSION: 8.3-fpm
+  DOCKER_HOST: tcp://127.0.0.1:2375
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        arch:
+        - x86_64
+        - arm64
+
+    name: Build Docker Image
+    runs-on: docker-${{ matrix.arch }}
+    container:
+      image: docker:dind
+      privileged: true
+    env:
+      ARCH: ${{ matrix.arch }}
+      VERSIONARCH: ${{ env.VERSION }}-${{ env.ARCH }}
+
+    steps:
+    - name: Environment Setup
+      run: |
+        # If we have a proxy use it
+        if [ -n "${HTTP_PROXY}" ]; then echo "HTTP PROXY [${HTTP_PROXY}]"; sed -i -e s'/https/http/' /etc/apk/repositories; fi
+        # Some pre-reqs
+        apk add git curl nodejs
+        # Start docker
+        ( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3
+        ## Some debugging info
+        # docker info && docker version
+        # env|sort
+
+    - name: Registry FQDN Setup
+      id: registry
+      run: |
+        registry=${{ github.server_url }}
+        echo "registry=${registry##http*://}" >> "$GITHUB_OUTPUT"
+
+    - name: Container Registry Login
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ steps.registry.outputs.registry }}
+        username: ${{ gitea.actor }}
+        password: ${{ secrets.PKG_WRITE_TOKEN }}
+
+    - name: Code Checkout
+      uses: actions/checkout@v4
+
+    - name: Build and Push Docker Image
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        file: docker/Dockerfile
+        push: true
+        tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}"
+
+  manifest:
+    name: Final Docker Image Manifest
+    runs-on: docker-x86_64
+    container:
+      image: docker:dind
+      privileged: true
+    needs: [build]
+
+    steps:
+    - name: Environment Setup
+      run: |
+        # If we have a proxy use it
+        if [ -n "${HTTP_PROXY}" ]; then echo "HTTP PROXY [${HTTP_PROXY}]"; sed -i -e s'/https/http/' /etc/apk/repositories; fi
+        # Some pre-reqs
+        apk add git curl nodejs
+        # Start docker
+        ( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3
+
+    - name: Registry FQDN Setup
+      id: registry
+      run: |
+        registry=${{ github.server_url }}
+        echo "registry=${registry##http*://}" >> "$GITHUB_OUTPUT"
+
+    - name: Container Registry Login
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ steps.registry.outputs.registry }}
+        username: ${{ gitea.actor }}
+        password: ${{ secrets.PKG_WRITE_TOKEN }}
+
+    - name: Build Docker Manifest
+      run: |
+        docker manifest create ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }} \
+          ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-x86_64 \
+          ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-arm64
+        docker manifest push --purge ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}
+
+  test:
+    strategy:
+      matrix:
+        arch:
+        - x86_64
+        # arm64
+
+    name: Build Docker Test Image
+    runs-on: docker-${{ matrix.arch }}
+    container:
+      image: docker:dind
+      privileged: true
+    env:
+      ARCH: ${{ matrix.arch }}
+      VERSIONARCH: ${{ env.VERSION }}-test-${{ env.ARCH }}
+    needs: [manifest]
+
+    steps:
+    - name: Environment Setup
+      run: |
+        # If we have a proxy use it
+        if [ -n "${HTTP_PROXY}" ]; then echo "HTTP PROXY [${HTTP_PROXY}]"; sed -i -e s'/https/http/' /etc/apk/repositories; fi
+        # Some pre-reqs
+        apk add git curl nodejs
+        # Start docker
+        ( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3
+        ## Some debugging info
+        # docker info && docker version
+        # env|sort
+
+    - name: Registry FQDN Setup
+      id: registry
+      run: |
+        registry=${{ github.server_url }}
+        echo "registry=${registry##http*://}" >> "$GITHUB_OUTPUT"
+
+    - name: Container Registry Login
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ steps.registry.outputs.registry }}
+        username: ${{ gitea.actor }}
+        password: ${{ secrets.PKG_WRITE_TOKEN }}
+
+    - name: Code Checkout
+      uses: actions/checkout@v4
+
+    - name: Build and Push Docker Image
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        file: docker/Dockerfile.phptest
+        push: true
+        tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}"
+
+  manifest-test:
+    name: Final Docker Test Image Manifest
+    runs-on: docker-x86_64
+    container:
+      image: docker:dind
+      privileged: true
+    needs: [test]
+
+    steps:
+    - name: Environment Setup
+      run: |
+        # If we have a proxy use it
+        if [ -n "${HTTP_PROXY}" ]; then echo "HTTP PROXY [${HTTP_PROXY}]"; sed -i -e s'/https/http/' /etc/apk/repositories; fi
+        # Some pre-reqs
+        apk add git curl nodejs
+        # Start docker
+        ( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3
+
+    - name: Registry FQDN Setup
+      id: registry
+      run: |
+        registry=${{ github.server_url }}
+        echo "registry=${registry##http*://}" >> "$GITHUB_OUTPUT"
+
+    - name: Container Registry Login
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ steps.registry.outputs.registry }}
+        username: ${{ gitea.actor }}
+        password: ${{ secrets.PKG_WRITE_TOKEN }}
+
+    - name: Build Docker Manifest
+      run: |
+        docker manifest create ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-test \
+          ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-test-x86_64
+          #${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-test-arm64
+        docker manifest push --purge ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-test

.gitlab-ci.yml

@@ -1,35 +0,0 @@
-stages:
-- build
-- build-manifest
-- build-test
-- build-manifest-test
-
-variables:
-  BRANCH: alpine
-  VERSION: 8.1-fpm-${BRANCH}
-  DOCKER_HOST: tcp://docker:2375
-  VERSIONARCH: ${VERSION}-${ARCH}
-
-cache:
-  key: ${CI_JOB_NAME_SLUG}-${CI_COMMIT_REF_SLUG}
-  paths:
-  - build-cache
-
-image: docker:latest
-services:
-- docker:dind
-
-before_script:
-- if [ ! -d build-cache ]; then mkdir build-cache; fi
-- if [ -n "${HTTP_PROXY}" ]; then echo "HTTP PROXY [${HTTP_PROXY}]"; sed -i -e s'/https/http/' /etc/apk/repositories; fi
-- apk add git curl
-- docker info && docker version
-# env|sort
-# docker login -u "$CI_DEPENDENCY_PROXY_USER" -p "$CI_DEPENDENCY_PROXY_PASSWORD" "$CI_SERVER_HOST"
-- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
-
-include:
-- .gitlab-docker-x86_64.yml
-- .gitlab-docker-armv7l.yml
-- .gitlab-docker-arm64.yml
-- .gitlab-docker-manifest.yml

.gitlab-docker-arm64.yml

@@ -1,29 +0,0 @@
-arm64:build:
-  variables:
-    ARCH: arm64
-  stage: build
-  script:
-  - if [ -f init ]; then chmod 500 init; fi
-  - ([ -z "$REFRESH" -a -f build-cache/${CI_COMMIT_REF_SLUG} ]) && docker load < build-cache/${CI_COMMIT_REF_SLUG} || true
-  - rm build-cache/* || true
-  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --cache-from ${CI_REGISTRY_IMAGE}:${VERSIONARCH} -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH} .
-  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}
-  - docker save ${CI_REGISTRY_IMAGE}:${VERSIONARCH} > build-cache/${CI_COMMIT_REF_SLUG}
-  tags:
-  - docker
-  - arm64
-  only:
-  - alpine
-
-#arm64:build-test:
-#  variables:
-#    ARCH: arm64
-#  stage: build-test
-#  script:
-#  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --file Dockerfile.phptest -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test .
-#  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test
-#  tags:
-#  - docker
-#  - arm64
-#  only:
-#  - alpine

.gitlab-docker-armv7l.yml

@@ -1,29 +0,0 @@
-armv7l:build:
-  variables:
-    ARCH: armv7l
-  stage: build
-  script:
-  - if [ -f init ]; then chmod 500 init; fi
-  - ([ -z "$REFRESH" -a -f build-cache/${CI_COMMIT_REF_SLUG} ]) && docker load < build-cache/${CI_COMMIT_REF_SLUG} || true
-  - rm build-cache/* || true
-  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --cache-from ${CI_REGISTRY_IMAGE}:${VERSIONARCH} -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH} .
-  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}
-  - docker save ${CI_REGISTRY_IMAGE}:${VERSIONARCH} > build-cache/${CI_COMMIT_REF_SLUG}
-  tags:
-  - docker
-  - armv7l
-  only:
-  - alpine
-
-#armv7l:build-test:
-#  variables:
-#    ARCH: armv7l
-#  stage: build-test
-#  script:
-#  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --file Dockerfile.phptest -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test .
-#  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test
-#  tags:
-#  - docker
-#  - armv7l
-#  only:
-#  - alpine

.gitlab-docker-manifest.yml

@@ -1,25 +0,0 @@
-x86_64:build-manifest:
-  stage: build-manifest
-  script:
-  - docker manifest create ${CI_REGISTRY_IMAGE}:${VERSION} ${CI_REGISTRY_IMAGE}:${VERSION}-x86_64 ${CI_REGISTRY_IMAGE}:${VERSION}-arm64 ${CI_REGISTRY_IMAGE}:${VERSION}-armv7l
-  - docker manifest push --purge ${CI_REGISTRY_IMAGE}:${VERSION}
-  - apk add --no-cache curl
-  - if [ -n "${AUTO_BUILD}" ]; then curl -LX POST --post301 -F token=${TRIGGER_TOKEN} -F ref=pgsql ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/trigger/pipeline; fi
-  - if [ -n "${AUTO_BUILD}" ]; then curl -LX POST --post301 -F token=${TRIGGER_TOKEN} -F ref=mysql ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/trigger/pipeline; fi
-  - if [ -n "${AUTO_BUILD}" ]; then curl -LX POST --post301 -F token=${TRIGGER_TOKEN} -F ref=ldap ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/trigger/pipeline; fi
-  tags:
-  - docker
-  - x86_64
-  only:
-  - alpine
-
-x86_64:build-manifest-test:
-  stage: build-manifest-test
-  script:
-  - docker manifest create ${CI_REGISTRY_IMAGE}:${VERSION}-test ${CI_REGISTRY_IMAGE}:${VERSION}-x86_64-test #${CI_REGISTRY_IMAGE}:${VERSION}-arm64-test #${CI_REGISTRY_IMAGE}:${VERSION}-armv7l-test
-  - docker manifest push --purge ${CI_REGISTRY_IMAGE}:${VERSION}-test
-  tags:
-  - docker
-  - x86_64
-  only:
-  - alpine

.gitlab-docker-x86_64.yml

@@ -1,29 +0,0 @@
-x86_64:build:
-  variables:
-    ARCH: x86_64
-  stage: build
-  script:
-  - if [ -f init ]; then chmod 500 init; fi
-  - ([ -z "$REFRESH" -a -f build-cache/${CI_COMMIT_REF_SLUG} ]) && docker load < build-cache/${CI_COMMIT_REF_SLUG} || true
-  - rm build-cache/* || true
-  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --cache-from ${CI_REGISTRY_IMAGE}:${VERSIONARCH} -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH} .
-  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}
-  - docker save ${CI_REGISTRY_IMAGE}:${VERSIONARCH} > build-cache/${CI_COMMIT_REF_SLUG}
-  tags:
-  - docker
-  - x86_64
-  only:
-  - alpine
-
-x86_64:build-test:
-  variables:
-    ARCH: x86_64
-  stage: build-test
-  script:
-  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --file Dockerfile.phptest -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test .
-  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test
-  tags:
-  - docker
-  - x86_64
-  only:
-  - alpine

Dockerfile.phptest

@@ -1,9 +0,0 @@
-# NAME leenooks/php
-# VERSION 8.1-fpm-alpine-test
-
-FROM registry.dege.au/leenooks/php:8.1-fpm-alpine
-
-# Add other built tools
-RUN apk --no-cache add npm linux-headers \
- && pecl_install xdebug \
- && apk --no-cache del linux-headers

docker/Dockerfile

@@ -1,7 +1,7 @@
-# NAME leenooks/php
-# VERSION 8.1-fpm-alpine
+# NAME docker/php
+# VERSION 8.3-fpm-alpine
 
-FROM php:8.1-fpm-alpine
+FROM php:8.3-fpm-alpine
 
 # Change to http respositories, so they we can cache the install packages
 RUN if [ -n ${HTTP_PROXY} ] ; then sed -i -e s'/https/http/' /etc/apk/repositories; fi
@@ -14,18 +14,20 @@ RUN sed -i -e 's#^memory_limit = 128M#memory_limit = 256M#' /usr/local/etc/php/p
 RUN adduser -g "Hosting Admin User" -u 1000 -G www-data -h /var/www/html -HD lamp
 
 # Base
-RUN apk add --no-cache bash git unzip zlib nginx msmtp
+RUN apk add --no-cache bash unzip zlib nginx msmtp
 RUN curl -SLo /usr/local/bin/wait-for-it https://github.com/vishnubob/wait-for-it/raw/master/wait-for-it.sh && chmod +x /usr/local/bin/wait-for-it
 
 # Memcache
 RUN apk add --no-cache memcached libmemcached pkgconfig zlib-dev memcached-dev libmemcached-dev && \
 	pecl_install igbinary msgpack memcached && \
+	mkdir /run/memcached && chown memcached:memcached /run/memcached && \
 	apk del --no-cache pkgconfig zlib-dev memcached-dev libmemcached-dev
 
 # Enable ZIP BZIP2
 RUN apk add --no-cache libzip libzip-dev zlib-dev && \
 	docker-php-ext-install -j$(nproc) zip bz2 && \
 	apk del --no-cache libzip-dev zlib-dev
+
 # Add zstd
 RUN pecl_install zstd
 
@@ -35,10 +37,16 @@ RUN apk add --no-cache libjpeg libgd libpng freetype freetype-dev zlib-dev libpn
 	docker-php-ext-install -j$(nproc) gd && \
 	apk del --no-cache zlib-dev libpng-dev jpeg-dev freetype-dev
 
+# Add intl
+RUN apk add --no-cache icu icu-dev && \
+	docker-php-ext-install -j$(nproc) intl && \
+	apk del --no-cache icu-dev
+
 # Add composer
 RUN curl -4 https://getcomposer.org/installer|php -- --install-dir=/usr/local/bin --filename=composer
 ENV COMPOSER_HOME=/var/cache/composer
 
+# Other config
 COPY msmtprc /etc/
 COPY docker/www.conf /usr/local/etc/php-fpm.d/
 COPY docker/nginx-app.conf /etc/nginx/http.d/default.conf

docker/Dockerfile.phptest

@@ -0,0 +1,9 @@
+# NAME docker/php
+# VERSION 8.3-fpm-test
+
+FROM gitea.dege.au/docker/php:8.3-fpm
+
+# Add xdebug
+RUN apk --no-cache add linux-headers \
+ && pecl_install xdebug \
+ && apk --no-cache del linux-headers

docker/init

@@ -31,22 +31,28 @@ function nginx_start() {
 	fi
 }
 
+function wait_for_db() {
+	# Wait for DB to be active
+	if [ -n "${DB_HOST}" -a -n "${DB_PORT}" ]; then
+		while ! wait-for-it -h ${DB_HOST} -p ${DB_PORT} -t 5 -q; do
+			echo "? Waiting for database at ${DB_HOST}:${DB_PORT}"
+			sleep 1;
+		done
+		echo "- DB is active on ${DB_HOST}:${DB_PORT}"
+	fi
+}
+
 # Run any container setup
 [ -x /sbin/init-container ] && /sbin/init-container
 
 # General Setup
 if [ -x /usr/bin/memcached -a "${MEMCACHED_START}" == "TRUE" ]; then
 	echo "* Starting MEMCACHED..."
-	/usr/bin/memcached -d -P /var/run/memcached.pid -u memcached
+	/usr/bin/memcached -d -P /run/memcached/memcached.pid -u memcached
 fi
 
 # Laravel Specific
-if [ "${role}" = "app" -a -e artisan ]; then
-	if [ ! -e ${php}/.env ]; then
-		echo "! ERROR: NO .env file..."
-		exec /bin/bash
-	fi
-
+if [ -r artisan -a -e ${php}/.env ]; then
 	mp=$(mp ${php})
 
 	# Only adjust perms if this is an external mountpoint
@@ -66,7 +72,6 @@ if [ "${role}" = "app" -a -e artisan ]; then
 		fi
 	fi
 
-	if [ "${env}" != "local" -a -r "artisan" ]; then
 	# See if we need to refresh our dependancies
 	if [[ -r composer.json && ( -e .composer.refresh || ! -d vendor ) ]]; then
 		echo "* Composer installing dependancies..."
@@ -89,25 +94,25 @@ if [ "${role}" = "app" -a -e artisan ]; then
 	fi
 
 	if [ -e .lumen ]; then
-			echo "* Lumen detected..."
+		echo "* Lumen detected, not caching configuration..."
 	else
+		# We only check for non mount points, in case this container has the app inside
+		mp=$(mp ${php})
+		if [ ${mp} -eq 1 ]; then
 			echo "* Caching configuration..."
-			su www-data -s /bin/sh -c "(php artisan optimize && php artisan view:cache)"
+			su www-data -s /bin/sh -c "(php artisan optimize)"
+		fi
 	fi
 
+	if [ "${role}" = "app" ]; then
+		if [ "${env}" != "local" ]; then
 			if [ -z "${IGNORE_MIGRATION}" ]; then
 				if [ -r .migrate ]; then
 					echo "* Running migration..."
 					# If DB_HOST not set, source the env file
 					[ -z "${DB_HOST}" -a -r .env ] && . .env
 
-				if [ -n "${DB_HOST}" -a -n "${DB_PORT}" ]; then
-					while ! wait-for-it -h ${DB_HOST} -p ${DB_PORT} -t 5 -q; do
-						echo "? Waiting for database at ${DB_HOST}:${DB_PORT}"
-						sleep 1;
-					done
-					echo "- DB is active on ${DB_HOST}:${DB_PORT}"
-				fi
+					wait_for_db
 
 					su www-data -s /bin/sh -c "php artisan migrate" && rm -f .migrate
 				fi
@@ -138,65 +143,36 @@ if [ "${role}" = "app" -a -e artisan ]; then
 
 		exec /usr/local/bin/docker-php-entrypoint "$@"
 
-elif [ "$role" = "queue" -a -e artisan ]; then
-	if [ ! -e ${php}/.env ]; then
-		echo "! ERROR: NO .env file..."
-		exec /bin/bash
-	fi
-
+	elif [ "$role" = "queue" ]; then
 		QUEUE_CMD=work
+
 		if [ "${env}" == "local" ]; then
 			QUEUE_CMD=listen
 		fi
 
-	if [ -e .lumen ]; then
-		echo "* Lumen detected..."
-	else
-		# We only check for non mount points, in case this container has the app inside
-		mp=$(mp ${php})
-		if [ ${mp} -eq 1 ]; then
-			echo "* Caching configuration..."
-			su www-data -s /bin/sh -c "(php artisan config:cache && php artisan route:cache && php artisan view:cache)"
-		fi
-	fi
-
 		echo "* Running the queue..."
 		# We'll delay starting in case the app is caching
 		sleep 15
 
+		wait_for_db
+
 		su www-data -s /bin/sh -c "
 		while true; do
 			php ${PHP_OPTIONS} artisan queue:${QUEUE_CMD} --verbose --tries=${WORK_TRIES:-1} --timeout=${WORK_TIMEOUT:-90} ${WORK_QUEUES:+--queue=${WORK_QUEUES}} ${WORK_MEMORY:+--memory=${WORK_MEMORY}} ${WORK_ONCE:+--once}
 		done
 		"
 
-elif [ "$role" = "scheduler" -a -e artisan ]; then
-	if [ ! -e ${php}/.env ]; then
-		echo "! ERROR: NO .env file..."
-		exec /bin/bash
-	fi
-
-	if [ -e .lumen ]; then
-		echo "* Lumen detected..."
-	else
-		# We only check for non mount points, in case this container has the app inside
-		mp=$(mp ${php})
-		if [ ${mp} -eq 1 ]; then
-			echo "* Caching configuration..."
-			su www-data -s /bin/sh -c "(php artisan config:cache && php artisan route:cache && php artisan view:cache)"
-		fi
-	fi
-
+	elif [ "$role" = "scheduler" ]; then
 		echo "* Running the scheduler..."
 		# We'll delay starting in case the app is caching
 		sleep 15
 
 		su www-data -s /bin/sh -c "
 		while true; do
-		(php ${PHP_OPTIONS} artisan schedule:run --verbose --no-interaction &)
-		sleep 60
+			php ${PHP_OPTIONS} artisan schedule:work --verbose --no-interaction
 		done
 		"
+	fi
 
 else
 	nginx_start

docker/pecl_install

@@ -12,4 +12,5 @@ for module in $@; do
 done
 
 # Clean up
+rm -rf /tmp/pear
 apk del --no-cache autoconf gcc libc-dev make

sshd_config.patch

@@ -1,18 +0,0 @@
---- /etc/ssh/sshd_config.orig   2018-02-27 08:33:29.613104521 +0000
-+++ /etc/ssh/sshd_config        2018-02-27 08:34:43.413485512 +0000
-@@ -30,6 +30,7 @@
- 
- #LoginGraceTime 2m
- #PermitRootLogin prohibit-password
-+PermitRootLogin no
- #StrictModes yes
- #MaxAuthTries 6
- #MaxSessions 10
-@@ -54,6 +55,7 @@
- 
- # To disable tunneled clear text passwords, change to no here!
- #PasswordAuthentication yes
-+PasswordAuthentication no
- #PermitEmptyPasswords no
- 
- # Change to yes to enable challenge-response passwords (beware issues with