From b80ef18abb63784ff469a555c512bbe667444b07 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 11 Mar 2022 12:31:11 -0500 Subject: [PATCH] rebase to 3.14 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 5 ++--- README.md | 1 + readme-vars.yml | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 916d7a3..4dd5a25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1dc8dd1..de73b9d 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7c766c1..92bd786 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14 # set version label ARG BUILD_DATE @@ -20,8 +20,7 @@ RUN \ php7-pdo_sqlite \ php7-pdo_mysql \ php7-tokenizer \ - php7-zip \ - tar && \ + php7-zip && \ echo "**** install heimdall ****" && \ mkdir -p \ /heimdall && \ diff --git a/README.md b/README.md index 4030028..0cbb667 100644 --- a/README.md +++ b/README.md @@ -240,6 +240,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **11.03.21:** - Rebase to alpine 3.14. * **10.02.21:** - Revert to alpine 3.12 as php 7.4 broke laravel. * **10.02.21:** - Rebasing to alpine 3.13. * **17.08.20:** - Add php7-curl. diff --git a/readme-vars.yml b/readme-vars.yml index 2dd2253..e578ca7 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,6 +49,7 @@ app_setup_block: | # changelog changelogs: + - { date: "11.03.21:", desc: "Rebase to alpine 3.14." } - { date: "10.02.21:", desc: "Revert to alpine 3.12 as php 7.4 broke laravel." } - { date: "10.02.21:", desc: "Rebasing to alpine 3.13." } - { date: "17.08.20:", desc: "Add php7-curl." }