From 41250006aaba8710c08e6cd1e1bbf02c74551aa6 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Fri, 11 Mar 2022 12:32:57 -0500
Subject: [PATCH] rebase to 3.14

---
 Dockerfile         | 5 ++---
 Dockerfile.aarch64 | 5 ++---
 Dockerfile.armhf   | 5 ++---
 README.md          | 1 +
 readme-vars.yml    | 1 +
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 15c39d7..ca3c4e8 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
@@ -17,8 +17,7 @@ RUN \
 	php7-ctype \
 	php7-pdo_sqlite \
 	php7-tokenizer \
-	php7-zip \
-	tar && \
+	php7-zip && \
  echo "**** install heimdall ****" && \
  mkdir -p \
 	/heimdall && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index e735e01..6130940 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
@@ -17,8 +17,7 @@ RUN \
 	php7-ctype \
 	php7-pdo_sqlite \
 	php7-tokenizer \
-	php7-zip \
-	tar && \
+	php7-zip && \
  echo "**** install heimdall ****" && \
  mkdir -p \
 	/heimdall && \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index f8862c9..afd6d07 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
@@ -17,8 +17,7 @@ RUN \
 	php7-ctype \
 	php7-pdo_sqlite \
 	php7-tokenizer \
-	php7-zip \
-	tar && \
+	php7-zip && \
  echo "**** install heimdall ****" && \
  mkdir -p \
 	/heimdall && \
diff --git a/README.md b/README.md
index f2a5cb7..c462bb9 100644
--- a/README.md
+++ b/README.md
@@ -236,6 +236,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.
 * **01.06.20:** - Rebasing to alpine 3.12.
diff --git a/readme-vars.yml b/readme-vars.yml
index 0d68cd8..94763f5 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -52,6 +52,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: "01.06.20:", desc: "Rebasing to alpine 3.12." }