pull base images before build

rammpeter · Jul 13, 2022 · 064a1e9 · 064a1e9
1 parent 3ed7268
commit 064a1e9
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/create_docker_image.sh b/create_docker_image.sh
@@ -1,15 +1,16 @@
 # Deploy Panorama to Dockerhub.com and Dockerhub.osp-dd.de
 # Peter Ramm, 21.09.2019
 
-for FROM in `grep "^FROM" Dockerfile | awk '{print $2}' | tail -n1`; do
+for FROM in `grep "^FROM" Dockerfile | grep -v scratch |  awk '{print $2}' | tail -n1`; do
   echo "Ensure using latest version of $FROM"
   docker pull $FROM
 done
 
 JRUBY_VERSION=`cat .ruby-version | cut -c 7-13`
 echo JRUBY_VERSION=$JRUBY_VERSION
 
-docker build --build-arg JRUBY_VERSION=$JRUBY_VERSION --progress=plain -t rammpeter/panorama .
+# Use "--progress=plain" to see the full console output
+docker build --build-arg JRUBY_VERSION=$JRUBY_VERSION -t rammpeter/panorama .
 RC=$?
 if [ $RC -ne 0 ]
 then