Merge pull request #91 from linuxserver/development-3.14

rebase to 3.14
This commit is contained in:
aptalca
2022-03-11 12:55:50 -05:00
committed by GitHub
5 changed files with 8 additions and 9 deletions

View File

@@ -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 # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -17,8 +17,7 @@ RUN \
php7-ctype \ php7-ctype \
php7-pdo_sqlite \ php7-pdo_sqlite \
php7-tokenizer \ php7-tokenizer \
php7-zip \ php7-zip && \
tar && \
echo "**** install heimdall ****" && \ echo "**** install heimdall ****" && \
mkdir -p \ mkdir -p \
/heimdall && \ /heimdall && \

View File

@@ -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 # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -17,8 +17,7 @@ RUN \
php7-ctype \ php7-ctype \
php7-pdo_sqlite \ php7-pdo_sqlite \
php7-tokenizer \ php7-tokenizer \
php7-zip \ php7-zip && \
tar && \
echo "**** install heimdall ****" && \ echo "**** install heimdall ****" && \
mkdir -p \ mkdir -p \
/heimdall && \ /heimdall && \

View File

@@ -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 # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -17,8 +17,7 @@ RUN \
php7-ctype \ php7-ctype \
php7-pdo_sqlite \ php7-pdo_sqlite \
php7-tokenizer \ php7-tokenizer \
php7-zip \ php7-zip && \
tar && \
echo "**** install heimdall ****" && \ echo "**** install heimdall ****" && \
mkdir -p \ mkdir -p \
/heimdall && \ /heimdall && \

View File

@@ -236,6 +236,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## 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:** - Revert to alpine 3.12 as php 7.4 broke laravel.
* **10.02.21:** - Rebasing to alpine 3.13. * **10.02.21:** - Rebasing to alpine 3.13.
* **01.06.20:** - Rebasing to alpine 3.12. * **01.06.20:** - Rebasing to alpine 3.12.

View File

@@ -52,6 +52,7 @@ app_setup_block: |
# changelog # changelog
changelogs: 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: "Revert to alpine 3.12 as php 7.4 broke laravel." }
- { date: "10.02.21:", desc: "Rebasing to alpine 3.13." } - { date: "10.02.21:", desc: "Rebasing to alpine 3.13." }
- { date: "01.06.20:", desc: "Rebasing to alpine 3.12." } - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }