Skip to content

Commit

Permalink
Merge pull request #13 from MauroDataMapper/hotfix/use-https
Browse files Browse the repository at this point in the history
Hotfix: Update jenkins.cs.ox.ac.uk URLs to use https
  • Loading branch information
jamesrwelch authored Feb 15, 2023
2 parents 2b35ec7 + 1f36b5d commit 7b781fc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions mauro-data-mapper/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"
LABEL org.opencontainers.image.authors="Oliver Freeman <oliver.freeman@bdi.ox.ac.uk>, Joe Crawford <joseph.crawford@bdi.ox.ac.uk>"

ARG MDM_APPLICATION_COMMIT=main
ARG MDM_UI_COMMIT=main
Expand Down Expand Up @@ -59,7 +59,7 @@ RUN cp -r $MDM_UI_BUILD_HOME/* .
RUN ls

FROM maurodatamapper/tomcat:$TOMCAT_IMAGE_VERSION
LABEL maintainer="Oliver Freeman <[email protected]>"
LABEL org.opencontainers.image.authors="Oliver Freeman <oliver.freeman@bdi.ox.ac.uk>, Joe Crawford <joseph.crawford@bdi.ox.ac.uk>"

ARG MDM_BUILD_HOME=/opt/mdm
ARG MDM_EXPLORER_BUILD_HOME=/opt/mdm-explorer/dist
Expand Down
2 changes: 1 addition & 1 deletion mauro-data-mapper/build_scripts/build_explorer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down

0 comments on commit 7b781fc

Please sign in to comment.