Update variants docker

Add testing branches to .dockstore.yml
broadinstitute · Sep 30, 2024 · 6a57677 · 6a57677
1 parent 2e2e793
commit 6a57677
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.dockstore.yml b/.dockstore.yml
@@ -290,6 +290,7 @@ workflows:
          branches:
              - master
              - ah_var_store
+             - gg_VS-1422_MergeVATChangesInEchoIntoAhVarStore
          tags:
              - /.*/
    - name: GvsQuickstartHailIntegration
@@ -299,6 +300,7 @@ workflows:
          branches:
              - master
              - ah_var_store
+             - gg_VS-1422_MergeVATChangesInEchoIntoAhVarStore
          tags:
              - /.*/
    - name: GvsQuickstartIntegration
@@ -309,6 +311,7 @@ workflows:
              - master
              - ah_var_store
              - vs_1456_status_writes_bug
+             - gg_VS-1422_MergeVATChangesInEchoIntoAhVarStore
          tags:
              - /.*/
    - name: GvsIngestTieout

diff --git a/scripts/variantstore/wdl/GvsUtils.wdl b/scripts/variantstore/wdl/GvsUtils.wdl
@@ -72,7 +72,7 @@ task GetToolVersions {
     # GVS generally uses the smallest `alpine` version of the Google Cloud SDK as it suffices for most tasks, but
     # there are a handlful of tasks that require the larger GNU libc-based `slim`.
     String cloud_sdk_slim_docker = "gcr.io/google.com/cloudsdktool/cloud-sdk:435.0.0-slim"
-    String variants_docker = "us-central1-docker.pkg.dev/broad-dsde-methods/gvs/variants:2024-09-11-alpine-72765c88f07b"
+    String variants_docker = "us-central1-docker.pkg.dev/broad-dsde-methods/gvs/variants:2024-09-30-alpine-27b8708f5808"
     String variants_nirvana_docker = "us.gcr.io/broad-dsde-methods/variantstore:nirvana_2022_10_19"
     String gatk_docker = "us-central1-docker.pkg.dev/broad-dsde-methods/gvs/gatk:2024_08_19-gatkbase-cd5b6b7821b2"
     String real_time_genomics_docker = "docker.io/realtimegenomics/rtg-tools:latest"

diff --git a/scripts/variantstore/wdl/extract/Dockerfile b/scripts/variantstore/wdl/extract/Dockerfile
@@ -8,7 +8,7 @@
 # expensive to create and isn't expected to change often, while the steps in this Dockerfile are much less expensive and
 # more likely to change. Using a build-base image essentially allows the expensive layers to be globally cached which
 # should make building the final image much faster in most cases.
-FROM us.gcr.io/broad-dsde-methods/variantstore:2024-07-01-alpine-build-base as build
+FROM us.gcr.io/broad-dsde-methods/variantstore:2024-09-30-alpine-build-base as build
 
 # Install all of our variantstore Python requirements.
 COPY requirements.txt requirements.txt

diff --git a/scripts/variantstore/wdl/extract/build_base.Dockerfile b/scripts/variantstore/wdl/extract/build_base.Dockerfile
@@ -36,7 +36,7 @@ RUN apk add autoconf bash cmake g++ gcc make ninja python3-dev git openssl-dev z
 
 ARG ARROW_VERSION=16.1.0
 RUN cd / && \
-    curl -O https://dlcdn.apache.org/arrow/arrow-$ARROW_VERSION/apache-arrow-$ARROW_VERSION.tar.gz && \
+    curl -O https://archive.apache.org/dist/arrow/arrow-$ARROW_VERSION/apache-arrow-$ARROW_VERSION.tar.gz && \
     tar xfz apache-arrow-$ARROW_VERSION.tar.gz
 
 # Pyarrow build instructions from https://arrow.apache.org/docs/developers/python.html#python-development