From 176471a1eb1bd1e7d0876d6bad0008aea59e6305 Mon Sep 17 00:00:00 2001 From: Damien Wilson Date: Fri, 6 Oct 2023 17:45:27 +0100 Subject: [PATCH] Upgrade software --- docker-compose.yml | 2 +- resources/ops/docker/dev/Dockerfile | 4 ++-- resources/ops/docker/fpm/Dockerfile | 2 +- resources/ops/docker/nginx/Dockerfile | 4 ++-- resources/views/layouts/app.blade.php | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 91f1e80..5cc9625 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: - node node: - image: node:18 + image: node:20 working_dir: /node entrypoint: make command: node-assets diff --git a/resources/ops/docker/dev/Dockerfile b/resources/ops/docker/dev/Dockerfile index 9381adf..a14eee4 100644 --- a/resources/ops/docker/dev/Dockerfile +++ b/resources/ops/docker/dev/Dockerfile @@ -61,7 +61,7 @@ RUN make test ### -FROM node:16 AS assets-build +FROM node:20.8 AS assets-build WORKDIR /code COPY . /code/ @@ -71,7 +71,7 @@ RUN npm run production ### -FROM nginx:1.19-alpine AS nginx +FROM nginx:1.25-alpine AS nginx COPY vhost-prod.conf /etc/nginx/conf.d/default.conf COPY --from=assets-build /code/public /var/www/html/ diff --git a/resources/ops/docker/fpm/Dockerfile b/resources/ops/docker/fpm/Dockerfile index c8c41fd..2ec00a7 100644 --- a/resources/ops/docker/fpm/Dockerfile +++ b/resources/ops/docker/fpm/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0-fpm-alpine AS base +FROM php:8.2-fpm-alpine AS base RUN apk add --update zlib-dev libpng-dev libzip-dev $PHPIZE_DEPS diff --git a/resources/ops/docker/nginx/Dockerfile b/resources/ops/docker/nginx/Dockerfile index 4c13ff2..ac16117 100644 --- a/resources/ops/docker/nginx/Dockerfile +++ b/resources/ops/docker/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16-alpine AS assets-build +FROM node:20.8-alpine AS assets-build WORKDIR /var/www/html COPY . /var/www/html/ @@ -7,7 +7,7 @@ RUN npm install RUN npm ci RUN npm run production -FROM nginx:1.19-alpine AS nginx +FROM nginx:1.25-alpine AS nginx COPY /resources/ops/docker/nginx/server.conf /etc/nginx/conf.d/default.conf COPY --from=assets-build /var/www/html/public /var/www/html/ diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index f497002..b3c077c 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -4,7 +4,7 @@ - + {{ config('app.name', 'Tool Procurement Centre | MoJ D&T') }} @@ -12,12 +12,12 @@ - + @stack('head') - + @@ -34,7 +34,7 @@ - +