From 6a7467c215e83fa7ff65365542d706bad04e19a1 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 22 Feb 2019 17:34:42 -0800 Subject: [PATCH 1/2] Rebasing to Alpine 3.9 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- readme-vars.yml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index baa4719..183cd53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/alpine.nginx:3.8 +FROM lsiobase/alpine.nginx:3.9 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6705a3d..02abb7f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/alpine.nginx.arm64:3.8 +FROM lsiobase/alpine.nginx.arm64:3.9 # Add qemu to build on x86_64 systems COPY qemu-aarch64-static /usr/bin diff --git a/Dockerfile.armhf b/Dockerfile.armhf index f0a63bb..ffb0253 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/alpine.nginx.armhf:3.8 +FROM lsiobase/alpine.nginx.armhf:3.9 # Add qemu to build on x86_64 systems COPY qemu-arm-static /usr/bin diff --git a/readme-vars.yml b/readme-vars.yml index 0d4a3fb..359d3b6 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -43,6 +43,7 @@ app_setup_nginx_reverse_proxy_block: "" # changelog changelogs: + - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." } - { date: "28.01.19:", desc: "Rebase to alpine linux 3.8 , add pipeline logic and multi arch." } - { date: "25.01.18:", desc: "Rebase to alpine linux 3.7." } - { date: "25.05.17:", desc: "Rebase to alpine linux 3.6." } From 6a3b7a6ae4a487e823e84f457e7148a9e51c4c90 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sat, 23 Feb 2019 17:59:52 -0800 Subject: [PATCH 2/2] adding php ldap --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + readme-vars.yml | 4 ++-- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 183cd53..bf4db13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,7 @@ RUN \ php7-exif \ php7-gd \ php7-imagick \ + php7-ldap \ php7-mysqli \ php7-mysqlnd \ php7-pear \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 02abb7f..3f29963 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -22,6 +22,7 @@ RUN \ php7-exif \ php7-gd \ php7-imagick \ + php7-ldap \ php7-mysqli \ php7-mysqlnd \ php7-pear \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index ffb0253..afcfe4d 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -22,6 +22,7 @@ RUN \ php7-exif \ php7-gd \ php7-imagick \ + php7-ldap \ php7-mysqli \ php7-mysqlnd \ php7-pear \ diff --git a/readme-vars.yml b/readme-vars.yml index 359d3b6..8da3057 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -43,7 +43,7 @@ app_setup_nginx_reverse_proxy_block: "" # changelog changelogs: - - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." } + - { date: "22.02.19:", desc: "Rebasing to alpine 3.9, add php-ldap." } - { date: "28.01.19:", desc: "Rebase to alpine linux 3.8 , add pipeline logic and multi arch." } - { date: "25.01.18:", desc: "Rebase to alpine linux 3.7." } - { date: "25.05.17:", desc: "Rebase to alpine linux 3.6." } @@ -52,4 +52,4 @@ changelogs: - { date: "23.02.17:", desc: "Rebase to alpine linux 3.5 and nginx." } - { date: "14.10.16:", desc: "Add version layer information." } - { date: "10.09.16:", desc: "Add layer badges to README." } - - { date: "29.08.15:", desc: "Initial Release." } \ No newline at end of file + - { date: "29.08.15:", desc: "Initial Release." }