LPAL-1230 Remove apk upgrade / update commands

ministryofjustice · Jul 25, 2023 · 8c2c751 · 8c2c751
1 parent 92b35ba
commit 8c2c751
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 22 deletions.
diff --git a/local-ssl/docker/Dockerfile b/local-ssl/docker/Dockerfile
@@ -3,5 +3,3 @@ FROM fsouza/docker-ssl-proxy
 # replace the nginx config from docker-ssl-proxy with a version tweaked
 # to mock out an X-Amzn-Trace-Id header
 COPY ./local-ssl/docker/nginx.conf.template /
-
-RUN apk upgrade --no-cache
diff --git a/node-build-assets/docker/Dockerfile b/node-build-assets/docker/Dockerfile
@@ -2,7 +2,6 @@
 # directory being mounted into this image at /service-front
 FROM node:19-alpine
 
-RUN apk upgrade --no-cache
 RUN apk add --no-cache ruby
 RUN npm install -g npm
 

diff --git a/service-admin/docker/app/Dockerfile b/service-admin/docker/app/Dockerfile
@@ -4,11 +4,11 @@ ENV OPG_PHP_POOL_CHILDREN_MAX="25"
 
 RUN adduser -D -g '' appuser
 
-RUN apk add --upgrade --no-cache apk-tools
-RUN apk upgrade --no-cache
+RUN apk add --no-cache apk-tools
+
 
 RUN apk add --no-cache icu fcgi \
-    && apk add --update --no-cache --virtual .build-dependencies $PHPIZE_DEPS icu-dev \
+    && apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS icu-dev \
     && docker-php-ext-install intl \
     && docker-php-ext-install bcmath
 

diff --git a/service-admin/docker/web/Dockerfile b/service-admin/docker/web/Dockerfile
@@ -16,8 +16,6 @@ RUN wget -q -O /usr/local/bin/confd "https://github.com/kelseyhightower/confd/re
 # Remove unused packages
 RUN apk del freetype nginx-module-image-filter curl
 
-# Upgrade vulnerable packages
-RUN apk upgrade --no-cache
 
 USER nginx
 COPY --chown=nginx:nginx service-admin/public /web

diff --git a/service-api/docker/app/Dockerfile b/service-api/docker/app/Dockerfile
@@ -4,11 +4,10 @@ ENV OPG_PHP_POOL_CHILDREN_MAX="25"
 
 RUN adduser -D -g '' appuser
 
-RUN apk add --upgrade --no-cache apk-tools
-RUN apk upgrade --no-cache
+RUN apk add --no-cache apk-tools
 
 RUN apk add --no-cache postgresql-libs icu fcgi \
-    && apk add --update --no-cache --virtual .build-dependencies $PHPIZE_DEPS postgresql-dev icu-dev linux-headers \
+    && apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS postgresql-dev icu-dev linux-headers \
     && docker-php-ext-install pgsql pdo_pgsql \
     && docker-php-ext-install bcmath \
     && docker-php-ext-install opcache \

diff --git a/service-api/docker/web/Dockerfile b/service-api/docker/web/Dockerfile
@@ -16,9 +16,6 @@ RUN wget -q -O /usr/local/bin/confd "https://github.com/kelseyhightower/confd/re
 # Remove unused packages
 RUN apk del freetype nginx-module-image-filter curl
 
-# Upgrade vulnerable packages
-RUN apk upgrade --no-cache
-
 USER nginx
 COPY --chown=nginx:nginx service-api/docker/web/etc /etc
 

diff --git a/service-front/docker/app/Dockerfile b/service-front/docker/app/Dockerfile
@@ -3,8 +3,8 @@ FROM php:8.2-fpm-alpine3.16
 ENV OPG_PHP_POOL_CHILDREN_MAX="25"
 
 RUN adduser -D -g '' appuser
-RUN apk add --upgrade --no-cache apk-tools
-RUN apk upgrade --no-cache
+RUN apk add --no-cache apk-tools
+
 
 # The --virtual flag puts build dependencies into their own
 # directory to make them easier to remove en masse

diff --git a/service-front/docker/web/Dockerfile b/service-front/docker/web/Dockerfile
@@ -16,8 +16,6 @@ RUN wget -q -O /usr/local/bin/confd "https://github.com/kelseyhightower/confd/re
 # Remove unused packages
 RUN apk del freetype nginx-module-image-filter curl
 
-# Upgrade vulnerable packages
-RUN apk upgrade --no-cache
 
 USER nginx
 COPY --chown=nginx:nginx service-front/public /web

diff --git a/service-pdf/docker/app/Dockerfile b/service-pdf/docker/app/Dockerfile
@@ -2,11 +2,10 @@ FROM php:8.1-cli-alpine3.15
 
 RUN adduser -D -g '' appuser
 
-RUN apk add --upgrade --no-cache apk-tools
-RUN apk upgrade --no-cache
+RUN apk add --no-cache apk-tools
 
-RUN apk update \
-    && apk add --no-cache openjdk8-jre bash libpng \
+
+RUN apk add --no-cache openjdk8-jre bash libpng \
     && apk add --no-cache --virtual .build-dependencies autoconf gcc make musl-dev pkgconfig zlib-dev libpng-dev \
     && docker-php-ext-install gd