Squash docker layers after building

fnproject · Feb 11, 2021 · d21e446 · d21e446
1 parent 740b95d
commit d21e446
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.circleci/install-docker.sh b/.circleci/install-docker.sh
@@ -5,4 +5,9 @@ set -ex
 docker version || true
 sudo service docker stop || true
 curl -fsSL https://get.docker.com/ | sudo sh
+# required for image squashing
+cat /etc/docker/daemon.json
+echo '{"experimental":true}' > /etc/docker/daemon.json
+sudo service docker restart
+
 docker version
diff --git a/build.sh b/build.sh
@@ -41,28 +41,28 @@ mvn  -B  deploy -DaltDeploymentRepository=localStagingDir::default::file://${REP
 
 (
   cd images/build
-  ./docker-build.sh --no-cache -t fnproject/fn-java-fdk-build:${BUILD_VERSION} .
+  ./docker-build.sh --squash --no-cache -t fnproject/fn-java-fdk-build:${BUILD_VERSION} .
 )
 
 (
   cd images/build
-  ./docker-build.sh --no-cache -f Dockerfile-jdk11 -t fnproject/fn-java-fdk-build:jdk11-${BUILD_VERSION} .
+  ./docker-build.sh --squash --no-cache -f Dockerfile-jdk11 -t fnproject/fn-java-fdk-build:jdk11-${BUILD_VERSION} .
 )
 
 (
    cd runtime
-   docker build --no-cache -t fnproject/fn-java-fdk:${BUILD_VERSION}  -f ../images/runtime/Dockerfile .
+   docker build --squash --no-cache -t fnproject/fn-java-fdk:${BUILD_VERSION}  -f ../images/runtime/Dockerfile .
 )
 
 (
    cd runtime
-   docker build --no-cache -f ../images/runtime/Dockerfile-jre11 -t fnproject/fn-java-fdk:jre11-${BUILD_VERSION} .
+   docker build --squash --no-cache -f ../images/runtime/Dockerfile-jre11 -t fnproject/fn-java-fdk:jre11-${BUILD_VERSION} .
 )
 
 (
     workdir=$(pwd)/runtime
     cd images/build-native
-    ./docker-build.sh ${workdir}
+    ./docker-build.sh  ${workdir}
 )
 
 (