From 89714012c63f3031f9572bec6724d96e354c1b16 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Wed, 7 Jul 2021 10:04:51 -0400
Subject: [PATCH] rebase to 3.14

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

diff --git a/Dockerfile b/Dockerfile
index 6cdfdb5..b9ae242 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.13
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index de75f45..a65521f 100755
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.13
+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 070529e..ddcae51 100755
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.13
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14
 
 # set version label
 ARG BUILD_DATE
diff --git a/README.md b/README.md
index 660856a..cd4b9ba 100644
--- a/README.md
+++ b/README.md
@@ -327,6 +327,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **07.07.21:** - Rebase to alpine 3.14.
 * **24.06.21:** - Update default nginx conf folder.
 * **28.05.21:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-server.conf - Use `resolver.conf` and patch for `CVE-2021-32637`.
 * **20.05.21:** - Modify resolver.conf generation to detect and ignore ipv6.
diff --git a/readme-vars.yml b/readme-vars.yml
index 51594b8..edbe29c 100755
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -151,6 +151,7 @@ app_setup_nginx_reverse_proxy_block: ""
 
 # changelog
 changelogs:
+  - { date: "07.07.21:", desc: "Rebase to alpine 3.14." }
   - { date: "24.06.21:", desc: "Update default nginx conf folder." }
   - { date: "28.05.21:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-server.conf - Use `resolver.conf` and patch for `CVE-2021-32637`." }
   - { date: "20.05.21:", desc: "Modify resolver.conf generation to detect and ignore ipv6." }