Merge pull request #1744 from craddm/update-proxies

Update Nexus proxy server for T2/T3 package access

deployment/safe_haven_management_environment/cloud_init/cloud-init-repository-proxy.mustache.yaml

@@ -94,7 +94,7 @@ packages:
   - clamav-freshclam
   - clamav-unofficial-sigs
   - docker.io
-  - docker-compose
+  - docker-compose-v2
   - python3-requests
 package_update: true
 package_upgrade: true
@@ -146,7 +146,7 @@ runcmd:
   - sleep 1m
   - systemctl status docker
   - docker --version
-  - docker-compose --version
+  - docker compose --version
 
   # Create directory for Nexus data that is owned by the correct user inside the Docker container
   - echo ">=== Creating Nexus data directory... ===<"
@@ -163,7 +163,7 @@ runcmd:
 
   # Set up the Nexus container
   - echo ">=== Creating Nexus container... ===<"
-  - su nexusdaemon -c "docker-compose -f /etc/nexus/docker-compose.yaml up -d"
+  - su nexusdaemon -c "docker compose -f /etc/nexus/docker-compose.yaml up -d"
 
   # Give Nexus some time to initialise
   - echo ">=== Waiting for Nexus to initialise (5 minutes)... ===<"

deployment/safe_haven_management_environment/cloud_init/resources/nexus_docker_compose.mustache.yaml

@@ -3,7 +3,7 @@ version: "3"
 services:
   nexus:
     container_name: nexus_nexus_compose
-    image: sonatype/nexus3:3.37.3
+    image: sonatype/nexus3:3.65.0
     expose:
       - 8081
     volumes:
@@ -13,7 +13,7 @@ services:
     restart: always
   nginx:
     container_name: nginx_nexus_compose
-    image: nginx:1.21.6
+    image: nginx:1.25
     ports:
       - 80:80
     volumes:

deployment/secure_research_environment/cloud_init/resources/guacamole_docker_compose.mustache.yaml

@@ -76,7 +76,7 @@ services:
 
     nginx:
         container_name: nginx_guacamole_compose
-        image: nginx:1.25.3
+        image: nginx:1.25
         links:
             - guacamole
         networks: