- robustness: improved docker builds

serviceprototypinglab · Jul 1, 2018 · 99908e2 · 99908e2
1 parent f8f5e05
commit 99908e2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/openshift/Dockerfile.complete b/openshift/Dockerfile.complete
@@ -6,6 +6,7 @@ FROM jszhaw/snafu
 
 RUN \
     # AWS CLI client / Docker CLI client
+    apt-get update && \
     apt-get install -y --no-install-recommends \
       awscli \
       docker.io \

diff --git a/openshift/build-docker-images.sh b/openshift/build-docker-images.sh
@@ -1,11 +1,17 @@
 #!/bin/sh
 
-rm -rf _snafu_clean_
-git clone .. _snafu_clean_
-#cd _snafu_clean_
-cp Dockerfile* _snafu_clean_
-docker build -t snafu -f _snafu_clean_/Dockerfile _snafu_clean_
-docker build -t snafucomplete -f _snafu_clean_/Dockerfile.complete _snafu_clean_
+if [ "$1" = "build" ]
+then
+	rm -rf _snafu_clean_
+	git clone .. _snafu_clean_
+	#cd _snafu_clean_
+	cp Dockerfile* _snafu_clean_
+	docker build -t snafu -f _snafu_clean_/Dockerfile _snafu_clean_
+	docker tag snafu jszhaw/snafu
+	docker build -t snafucomplete -f _snafu_clean_/Dockerfile.complete _snafu_clean_
+else
+	echo "# Note: Not building. Run with 'build' option to build."
+fi
 
 if [ "$1" = "release" ]
 then