This is an automated email from the ASF dual-hosted git repository.
mhenke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-php.git
The following commit(s) were added to refs/heads/master by this push:
new 6d36867 Install latest security fixes with every build. (#90)
6d36867 is described below
commit 6d368673549348667bab22f48186067a7191374b
Author: falkzoll <[email protected]>
AuthorDate: Wed Jun 10 14:26:41 2020 +0200
Install latest security fixes with every build. (#90)
* Add apt-get upgrade to php7.3 and php7.4 to always install latest
security fixes during every build.
This is done to always have an up to date image even when the base
image is not updated for some reason.
* Cleanup apt data once they are not required anymore.
---
core/php7.3Action/Dockerfile | 10 +++++++---
core/php7.4Action/Dockerfile | 10 +++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/core/php7.3Action/Dockerfile b/core/php7.3Action/Dockerfile
index 692ff5a..602da3d 100644
--- a/core/php7.3Action/Dockerfile
+++ b/core/php7.3Action/Dockerfile
@@ -35,8 +35,10 @@ ARG GO_PROXY_BUILD_FROM=release
# install dependencies
RUN \
- apt-get -y update && \
- apt-get -y install \
+ apt-get -y update \
+ # Upgrade installed packages to get latest security fixes if the base
image does not contain them already.
+ && apt-get upgrade -y --no-install-recommends \
+ && apt-get -y install \
libfreetype6-dev \
libicu-dev \
libicu57 \
@@ -47,7 +49,9 @@ RUN \
libzip-dev \
postgresql-server-dev-9.6 \
unzip \
- zlib1g-dev
+ zlib1g-dev \
+ # Cleanup apt data, we do not need them later on.
+ && rm -rf /var/lib/apt/lists/*
# Install useful PHP extensions
RUN \
diff --git a/core/php7.4Action/Dockerfile b/core/php7.4Action/Dockerfile
index 15ef440..595d2ca 100644
--- a/core/php7.4Action/Dockerfile
+++ b/core/php7.4Action/Dockerfile
@@ -35,8 +35,10 @@ ARG GO_PROXY_BUILD_FROM=release
# install dependencies
RUN \
- apt-get -y update && \
- apt-get -y install \
+ apt-get -y update \
+ # Upgrade installed packages to get latest security fixes if the base
image does not contain them already.
+ && apt-get upgrade -y --no-install-recommends \
+ && apt-get -y install \
libfreetype6-dev \
libicu-dev \
libicu63 \
@@ -47,7 +49,9 @@ RUN \
libzip-dev \
postgresql-server-dev-11 \
unzip \
- zlib1g-dev
+ zlib1g-dev \
+ # Cleanup apt data, we do not need them later on.
+ && rm -rf /var/lib/apt/lists/*
# Install useful PHP extensions
RUN \
