[NWSDE #78] Temporarily override the workspace inheritance until micr…

…osoft#4190 is merged
nwsde · Dec 16, 2024 · 3fa48f8 · 3fa48f8
1 parent 1c0bee5
commit 3fa48f8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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