From 11f000fc8912e076604e5716ff4896446fb763b8 Mon Sep 17 00:00:00 2001 From: Aleksander Cynarski Date: Sat, 3 Jul 2021 14:26:11 +0200 Subject: [PATCH] php 7.2 optimize, add testing repository for fluentbit --- Dockerfile | 7 +++---- docker/usr/local/bin/php_configure.sh | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index fd423ff..6ac100a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,14 +47,13 @@ FROM php:${PHP_VERSION} ARG ENVIRONMENT=production # Add testing alpine repository -# RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing/x86" >> /etc/apk/repositories \ -# apk update +RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && apk update # install system libs -RUN apk update && apk add --no-cache libintl c-client libpng icu-libs libldap libpq libjpeg freetype libzip shadow sudo wget bash git openssh supervisor nginx openssl zip +RUN apk add --no-cache libintl c-client libpng icu-libs libldap libpq libjpeg freetype libzip shadow sudo wget bash git openssh supervisor nginx openssl zip fluent-bit # force apk upgrade, clear apk cache -RUN apk upgrade && rm -rf /var/cache/apk/* +RUN apk --no-cache upgrade && rm -rf /var/cache/apk/* ENV DIR /var/www ENV DOCKERIZE_VERSION v0.6.1 diff --git a/docker/usr/local/bin/php_configure.sh b/docker/usr/local/bin/php_configure.sh index 42be72a..cfa2b3e 100755 --- a/docker/usr/local/bin/php_configure.sh +++ b/docker/usr/local/bin/php_configure.sh @@ -6,7 +6,7 @@ PHP_MODULES=("calendar" "bcmath" "bz2" "curl" "fileinfo" "gd" "gettext" "iconv" # # Helper functions # -declare -i term_width=120 +declare -i term_width=80 h1() { declare border padding text