From 1f36b5dae67c68786cb6dd9eae5e44cfa605877a Mon Sep 17 00:00:00 2001 From: Joe Crawford Date: Wed, 15 Feb 2023 15:20:22 +0000 Subject: [PATCH] Hotfix: Update jenkins.cs.ox.ac.uk URLs to use https --- mauro-data-mapper/Dockerfile | 8 ++++---- mauro-data-mapper/build_scripts/build_explorer.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mauro-data-mapper/Dockerfile b/mauro-data-mapper/Dockerfile index f340704..defcc13 100644 --- a/mauro-data-mapper/Dockerfile +++ b/mauro-data-mapper/Dockerfile @@ -1,9 +1,9 @@ -ARG MDM_BASE_IMAGE_VERSION=grails-5.1.7-jdk17.0.3_7-node-14.18.1-npm-8.3.0 -ARG TOMCAT_IMAGE_VERSION=9.0.62-jre17-temurin +ARG MDM_BASE_IMAGE_VERSION=grails-5.1.9-jdk17.0.3_7-node-14.18.1-npm-8.3.0.R2 +ARG TOMCAT_IMAGE_VERSION=9.0.65-jre17-temurin FROM maurodatamapper/mdm_base:$MDM_BASE_IMAGE_VERSION AS mdm-build -LABEL maintainer="Oliver Freeman " +LABEL org.opencontainers.image.authors="Oliver Freeman , Joe Crawford " ARG MDM_APPLICATION_COMMIT=main ARG MDM_UI_COMMIT=main @@ -59,7 +59,7 @@ RUN cp -r $MDM_UI_BUILD_HOME/* . RUN ls FROM maurodatamapper/tomcat:$TOMCAT_IMAGE_VERSION -LABEL maintainer="Oliver Freeman " +LABEL org.opencontainers.image.authors="Oliver Freeman , Joe Crawford " ARG MDM_BUILD_HOME=/opt/mdm ARG MDM_EXPLORER_BUILD_HOME=/opt/mdm-explorer/dist diff --git a/mauro-data-mapper/build_scripts/build_explorer.sh b/mauro-data-mapper/build_scripts/build_explorer.sh index 5a49322..ec329f8 100755 --- a/mauro-data-mapper/build_scripts/build_explorer.sh +++ b/mauro-data-mapper/build_scripts/build_explorer.sh @@ -10,7 +10,7 @@ precompiledBuild(){ MDM_EXPLORER_LIBRARY='artifacts' fi - MDM_EXPLORER_URL="http://jenkins.cs.ox.ac.uk/artifactory/${MDM_EXPLORER_LIBRARY}/mauroDataMapper/mdm-explorer/mdm-explorer-${MDM_EXPLORER_VERSION}.tgz" + MDM_EXPLORER_URL="https://jenkins.cs.ox.ac.uk/artifactory/${MDM_EXPLORER_LIBRARY}/mauroDataMapper/mdm-explorer/mdm-explorer-${MDM_EXPLORER_VERSION}.tgz" echo "Downloading precompiled sources ${MDM_EXPLORER_URL}"