From 4249427721badbb130c22ba3ce98d10bfa8f0a43 Mon Sep 17 00:00:00 2001 From: jonnyry Date: Mon, 16 Dec 2024 11:43:14 +0000 Subject: [PATCH] [NWSDE #78] Temporarily override the workspace inheritance until https://github.com/microsoft/AzureTRE/pull/4190 is merged --- .../workspaces/airlock-import-review/Dockerfile.tmpl | 8 +++++--- .../workspaces/nwsde-data-engineering/Dockerfile.tmpl | 8 +++++--- templates/workspaces/nwsde-research/Dockerfile.tmpl | 8 +++++--- templates/workspaces/unrestricted/Dockerfile.tmpl | 10 ++++++---- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/templates/workspaces/airlock-import-review/Dockerfile.tmpl b/templates/workspaces/airlock-import-review/Dockerfile.tmpl index dcc43bb677..27788182fe 100644 --- a/templates/workspaces/airlock-import-review/Dockerfile.tmpl +++ b/templates/workspaces/airlock-import-review/Dockerfile.tmpl @@ -9,13 +9,15 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloa RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \ apt-get update && apt-get install -y git jq curl ca-certificates patch --no-install-recommends -ARG AZURE_TRE_VERSION="0.19.1" +ARG AZURE_TRE_ORG_NAME="nwsde" +ARG AZURE_TRE_REPO_NAME="nwsde-azuretre" +ARG AZURE_TRE_BRANCH="develop" WORKDIR ${BUNDLE_DIR} # Copy all files from base workspace (note: some of them will be overwritten with the following COPY command) -RUN curl -o azuretre.tar.gz -L "https://github.com/microsoft/AzureTRE/archive/refs/tags/v${AZURE_TRE_VERSION}.tar.gz" \ - && tar -xzf azuretre.tar.gz "AzureTRE-${AZURE_TRE_VERSION}/templates/workspaces/base" --strip-components=4 --skip-old-files \ +RUN curl -o azuretre.tar.gz -L "https://github.com/${AZURE_TRE_ORG_NAME}/${AZURE_TRE_REPO_NAME}/archive/refs/heads/${AZURE_TRE_BRANCH}.tar.gz" \ + && tar -xzf azuretre.tar.gz "${AZURE_TRE_REPO_NAME}-${AZURE_TRE_BRANCH}/templates/workspaces/base" --strip-components=4 --skip-old-files \ && rm -rf azuretre.tar.gz # Copy and change the file extension of .terraform file to .tf diff --git a/templates/workspaces/nwsde-data-engineering/Dockerfile.tmpl b/templates/workspaces/nwsde-data-engineering/Dockerfile.tmpl index 30701d2c3b..ed01e9807d 100644 --- a/templates/workspaces/nwsde-data-engineering/Dockerfile.tmpl +++ b/templates/workspaces/nwsde-data-engineering/Dockerfile.tmpl @@ -9,13 +9,15 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloa RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \ apt-get update && apt-get install -y git jq curl ca-certificates patch --no-install-recommends -ARG AZURE_TRE_VERSION="0.19.1" +ARG AZURE_TRE_ORG_NAME="nwsde" +ARG AZURE_TRE_REPO_NAME="nwsde-azuretre" +ARG AZURE_TRE_BRANCH="develop" WORKDIR ${BUNDLE_DIR} # Copy all files from base workspace (note: some of them will be overwritten with the following COPY command) -RUN curl -o azuretre.tar.gz -L "https://github.com/microsoft/AzureTRE/archive/refs/tags/v${AZURE_TRE_VERSION}.tar.gz" \ - && tar -xzf azuretre.tar.gz "AzureTRE-${AZURE_TRE_VERSION}/templates/workspaces/base" --strip-components=4 --skip-old-files \ +RUN curl -o azuretre.tar.gz -L "https://github.com/${AZURE_TRE_ORG_NAME}/${AZURE_TRE_REPO_NAME}/archive/refs/heads/${AZURE_TRE_BRANCH}.tar.gz" \ + && tar -xzf azuretre.tar.gz "${AZURE_TRE_REPO_NAME}-${AZURE_TRE_BRANCH}/templates/workspaces/base" --strip-components=4 --skip-old-files \ && rm -rf azuretre.tar.gz # Copy and change the file extension of .terraform file to .tf diff --git a/templates/workspaces/nwsde-research/Dockerfile.tmpl b/templates/workspaces/nwsde-research/Dockerfile.tmpl index b03d32e489..7a3252a87b 100644 --- a/templates/workspaces/nwsde-research/Dockerfile.tmpl +++ b/templates/workspaces/nwsde-research/Dockerfile.tmpl @@ -9,13 +9,15 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloa RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \ apt-get update && apt-get install -y git jq curl ca-certificates patch --no-install-recommends -ARG AZURE_TRE_VERSION="0.19.1" +ARG AZURE_TRE_ORG_NAME="nwsde" +ARG AZURE_TRE_REPO_NAME="nwsde-azuretre" +ARG AZURE_TRE_BRANCH="develop" WORKDIR ${BUNDLE_DIR} # Copy all files from base workspace (note: some of them will be overwritten with the following COPY command) -RUN curl -o azuretre.tar.gz -L "https://github.com/microsoft/AzureTRE/archive/refs/tags/v${AZURE_TRE_VERSION}.tar.gz" \ - && tar -xzf azuretre.tar.gz "AzureTRE-${AZURE_TRE_VERSION}/templates/workspaces/base" --strip-components=4 --skip-old-files \ +RUN curl -o azuretre.tar.gz -L "https://github.com/${AZURE_TRE_ORG_NAME}/${AZURE_TRE_REPO_NAME}/archive/refs/heads/${AZURE_TRE_BRANCH}.tar.gz" \ + && tar -xzf azuretre.tar.gz "${AZURE_TRE_REPO_NAME}-${AZURE_TRE_BRANCH}/templates/workspaces/base" --strip-components=4 --skip-old-files \ && rm -rf azuretre.tar.gz # Copy and change the file extension of .terraform file to .tf diff --git a/templates/workspaces/unrestricted/Dockerfile.tmpl b/templates/workspaces/unrestricted/Dockerfile.tmpl index 04eaf4f8c0..859486003b 100644 --- a/templates/workspaces/unrestricted/Dockerfile.tmpl +++ b/templates/workspaces/unrestricted/Dockerfile.tmpl @@ -9,13 +9,15 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloa RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \ apt-get update && apt-get install -y git jq curl ca-certificates patch --no-install-recommends -ARG AZURE_TRE_VERSION="0.19.1" +ARG AZURE_TRE_ORG_NAME="nwsde" +ARG AZURE_TRE_REPO_NAME="nwsde-azuretre" +ARG AZURE_TRE_BRANCH="develop" -WORKDIR $BUNDLE_DIR +WORKDIR ${BUNDLE_DIR} # Copy all files from base workspace (note: some of them will be overwritten with the following COPY command) -RUN curl -o azuretre.tar.gz -L "https://github.com/microsoft/AzureTRE/archive/refs/tags/v${AZURE_TRE_VERSION}.tar.gz" \ - && tar -xzf azuretre.tar.gz "AzureTRE-${AZURE_TRE_VERSION}/templates/workspaces/base" --strip-components=4 --skip-old-files \ +RUN curl -o azuretre.tar.gz -L "https://github.com/${AZURE_TRE_ORG_NAME}/${AZURE_TRE_REPO_NAME}/archive/refs/heads/${AZURE_TRE_BRANCH}.tar.gz" \ + && tar -xzf azuretre.tar.gz "${AZURE_TRE_REPO_NAME}-${AZURE_TRE_BRANCH}/templates/workspaces/base" --strip-components=4 --skip-old-files \ && rm -rf azuretre.tar.gz # PORTER_MIXINS