Squash docker layers after building

zootalures · zootalures · commit 82a9c8dd035e · 2021-02-10T20:26:37.000Z
diff --git a/build.sh b/build.sh
@@ -41,31 +41,31 @@ 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 --squash ${workdir}
 )
 
 (
     cd images/init-native
-    ./docker-build.sh
+    ./docker-build.sh --squash
 )

Original file line number	Diff line number	Diff line change
`@@ -41,31 +41,31 @@ mvn -B deploy -DaltDeploymentRepository=localStagingDir::default::file://${REP`
`41`	`41`
`42`	`42`	`(`
`43`	`43`	`cd images/build`
`44`		`- ./docker-build.sh --no-cache -t fnproject/fn-java-fdk-build:${BUILD_VERSION} .`
	`44`	`+ ./docker-build.sh --squash --no-cache -t fnproject/fn-java-fdk-build:${BUILD_VERSION} .`
`45`	`45`	`)`
`46`	`46`
`47`	`47`	`(`
`48`	`48`	`cd images/build`
`49`		`- ./docker-build.sh --no-cache -f Dockerfile-jdk11 -t fnproject/fn-java-fdk-build:jdk11-${BUILD_VERSION} .`
	`49`	`+ ./docker-build.sh --squash --no-cache -f Dockerfile-jdk11 -t fnproject/fn-java-fdk-build:jdk11-${BUILD_VERSION} .`
`50`	`50`	`)`
`51`	`51`
`52`	`52`	`(`
`53`	`53`	`cd runtime`
`54`		`- docker build --no-cache -t fnproject/fn-java-fdk:${BUILD_VERSION} -f ../images/runtime/Dockerfile .`
	`54`	`+ docker build --squash --no-cache -t fnproject/fn-java-fdk:${BUILD_VERSION} -f ../images/runtime/Dockerfile .`
`55`	`55`	`)`
`56`	`56`
`57`	`57`	`(`
`58`	`58`	`cd runtime`
`59`		`- docker build --no-cache -f ../images/runtime/Dockerfile-jre11 -t fnproject/fn-java-fdk:jre11-${BUILD_VERSION} .`
	`59`	`+ docker build --squash --no-cache -f ../images/runtime/Dockerfile-jre11 -t fnproject/fn-java-fdk:jre11-${BUILD_VERSION} .`
`60`	`60`	`)`
`61`	`61`
`62`	`62`	`(`
`63`	`63`	`workdir=$(pwd)/runtime`
`64`	`64`	`cd images/build-native`
`65`		`- ./docker-build.sh ${workdir}`
	`65`	`+ ./docker-build.sh --squash ${workdir}`
`66`	`66`	`)`
`67`	`67`
`68`	`68`	`(`
`69`	`69`	`cd images/init-native`
`70`		`- ./docker-build.sh`
	`70`	`+ ./docker-build.sh --squash`
`71`	`71`	`)`