update Dockerfile

AgBase · Apr 14, 2023 · de9eca4 · de9eca4
2 parents 3e4472d + 4d54455
commit de9eca4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 41,451 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -0,0 +1,18 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build the Docker image
+      run: docker build  https://github.com/AgBase/GOanna.git#master:goanna_2.3
diff --git a/goanna_2.3/Dockerfile b/goanna_2.3/Dockerfile
@@ -25,8 +25,13 @@ RUN conda config --add channels bioconda
 
 RUN conda upgrade conda
 
+<<<<<<< HEAD
 # add blast 2.7.1
 RUN conda install -c conda-forge -c bioconda blast==2.7.1
+=======
+# ADD BLAST 2.13.0
+RUN conda install -c conda-forge -c bioconda blast==2.13.0
+>>>>>>> origin/master
 
 ENV PATH /masterscript.sh/:$PATH
 
@@ -50,6 +55,5 @@ ADD GO0032991_and_children.json /usr
 # Entrypoint
 ENTRYPOINT ["/usr/bin/masterscript.sh"]
 
-
 # Add path to working directory
 WORKDIR /work-dir