Upgrade software

ministryofjustice · Oct 6, 2023 · 176471a · 176471a
1 parent 03f73f1
commit 176471a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -4,20 +4,20 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="csrf-token" content="{{ csrf_token() }}">
-    <link rel="icon" href="{{ asset('assets/judiciary-icon.png') }}" type="image/x-icon">
+    <link rel="icon" href="{{ mix('assets/judiciary-icon.png') }}" type="image/x-icon">
 
     <title>{{ config('app.name', 'Tool Procurement Centre | MoJ D&T') }}</title>
 
     <!-- Fonts -->
     <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap">
 
     <!-- Styles -->
-    <link rel="stylesheet" href="{{ asset('assets/css/app.css') }}">
+    <link rel="stylesheet" href="{{ mix('assets/css/app.css') }}">
 
     <!-- Scripts -->
     <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
     @stack('head')
-    <script src="{{ asset('assets/js/app.js') }}" defer></script>
+    <script src="{{ mix('assets/js/app.js') }}" defer></script>
 </head>
 <body>
 <script>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
@@ -34,7 +34,7 @@
 </div>
 <x-footer/>
 
-<script src="{{ asset('assets/js/govuk.js') }}"></script>
+<script src="{{ mix('assets/js/govuk.js') }}"></script>
 <script>
     window.GOVUKFrontend.initAll();
 </script>