update dockerfiles: delete obsolete lines, set release branch uap-v1.1

alexanderscholz · Feb 15, 2019 · 37badc9 · 37badc9
1 parent 93a5cd3
commit 37badc9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 21 deletions.
diff --git a/uap/Dockerfile.uap.1.0.0 b/uap/Dockerfile.uap.1.0.0
@@ -199,7 +199,7 @@ ENV PATH /home/uap_user/bioinformatic-tools/tophat2/tophat-2.1.1.Linux_x86_64:$P
 RUN mkdir -p /home/uap_user/uap
 WORKDIR /home/uap_user/uap
 RUN git clone https://github.com/yigbt/uap.git . && \
-    git checkout release && \
+    git checkout uap-v1.1 && \
     ./bootstrap.sh
 ENV PATH /home/uap_user/uap:$PATH
 

diff --git a/uap/Dockerfile.uap.1.0.0-ChIPseq-short b/uap/Dockerfile.uap.1.0.0-ChIPseq-short
@@ -10,12 +10,8 @@ LABEL maintainer.1.name="Alexander Scholz" \
 
 WORKDIR /home/uap_user/uap/
 # Update master
-RUN git checkout master && \
-    git pull origin master
-
-# Update release
-RUN git checkout release && \
-    git pull origin release
+RUN git checkout uap-v1.1 && \
+    git pull origin uap-v1.1
 
 ###############################################################################
 # Run uap workflows

diff --git a/uap/Dockerfile.uap.1.0.0-RNAseq b/uap/Dockerfile.uap.1.0.0-RNAseq
@@ -10,12 +10,8 @@ LABEL maintainer.1.name="Alexander Scholz" \
 
 WORKDIR /home/uap_user/uap/
 # Update master
-RUN git checkout master && \
-    git pull origin master
-
-# Update release
-RUN git checkout release && \
-    git pull origin release
+RUN git checkout uap-v1.1 && \
+    git pull origin uap-v1.1
 
 ###############################################################################
 # Run uap workflows

diff --git a/uap/Dockerfile.uap.1.0.0-RNAseq-data-download b/uap/Dockerfile.uap.1.0.0-RNAseq-data-download
@@ -10,12 +10,8 @@ LABEL maintainer.1.name="Alexander Scholz" \
 
 WORKDIR /home/uap_user/uap/
 # Update master
-RUN git checkout master && \
-    git pull origin master
-
-# Update release
-RUN git checkout release && \
-    git pull origin release
+RUN git checkout uap-v1.1 && \
+    git pull origin uap-v1.1
 
 ###############################################################################
 # Run uap workflows

diff --git a/uap/Makefile b/uap/Makefile
@@ -26,15 +26,15 @@ docker-build-1.0.0-ChIPseq:
 	docker build \
 		--network host \
 		--tag yigbt/uap:1.0.0-ChIPseq \
-		--file Dockerfile.uap.1.0.0-ChIPseq \
+		--file Dockerfile.uap.1.0.0-ChIPseq-short \
 		. # Current folder is the Docker build context
 
 docker-build-no-cache-1.0.0-ChIPseq:
 	docker build \
 		--network host \
 		--no-cache \
 		--tag yigbt/uap:1.0.0-ChIPseq \
-		--file Dockerfile.uap.1.0.0-ChIPseq \
+		--file Dockerfile.uap.1.0.0-ChIPseq-short \
 		. # Current folder is the Docker build context
 
 docker-run-1.0.0-ChIPseq: