Merge pull request #195 from PNNL-CompBio/docker-build

updated docker build to save time
PNNL-CompBio · Jul 9, 2024 · 88a8886 · 88a8886
2 parents 0652881 + cc1c219
commit 88a8886
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
           file: ./build/docker/Dockerfile.broad_sanger_omics
           tags: sgosline/broad-sanger-omics:latest
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
   build-cellline-exp:
     runs-on: ubuntu-latest
     steps:
@@ -50,7 +50,7 @@ jobs:
           file: ./build/docker/Dockerfile.broad_sanger_exp
           tags: sgosline/broad-sanger-exp:latest
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
   build-genes:
     runs-on: ubuntu-latest
     steps:
@@ -71,7 +71,7 @@ jobs:
           file: ./build/docker/Dockerfile.genes
           tags: sgosline/genes:latest
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
   build-hcmi:
     runs-on: ubuntu-latest
     steps:
@@ -92,7 +92,7 @@ jobs:
           file: ./build/docker/Dockerfile.hcmi
           tags: sgosline/hcmi:latest
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
   build-cptac:
     runs-on: ubuntu-latest
     steps:
@@ -113,7 +113,7 @@ jobs:
           file: ./build/docker/Dockerfile.cptac
           tags: sgosline/cptac:latest
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
   build-mpnst:
     runs-on: ubuntu-latest
     steps:
@@ -134,7 +134,7 @@ jobs:
           file: ./build/docker/Dockerfile.mpnst
           tags: sgosline/mpnst:latest
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
   build-beataml:
     runs-on: ubuntu-latest
     steps:
@@ -155,7 +155,7 @@ jobs:
           file: ./build/docker/Dockerfile.beataml
           tags: sgosline/beataml:latest
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
   build-upload:
     runs-on: ubuntu-latest
     steps:
@@ -176,6 +176,5 @@ jobs:
           file: ./build/docker/Dockerfile.upload
           tags: sgosline/upload:latest
           push: true
-          platforms: linux/amd64,linux/arm64        
-
-
+          platforms: linux/amd64        
+
diff --git a/build/broad_sanger/exp_requirements.r b/build/broad_sanger/exp_requirements.r
@@ -1,8 +1,9 @@
-install.packages("readr")
-install.packages("stringr")
-install.packages("dplyr")
+#install.packages("readr")
+#install.packages("stringr")
+#install.packages("dplyr")
 install.packages('reticulate')
-install.packages('tidyr')
+                                        #install.packages('tidyr')
+install.packages('tidyverse')
 install.packages("BiocManager")
 BiocManager::install("PharmacoGx",update=TRUE,ask=FALSE)
 
diff --git a/build/broad_sanger/omics_requirements.r b/build/broad_sanger/omics_requirements.r
@@ -5,5 +5,5 @@ install.packages("curl")
 install.packages("stringr")
 install.packages("dplyr")
 install.packages("XML")
-install.packages('reticulate')
+#install.packages('reticulate')
 install.packages('tidyr')