Squash docker images to have less layers and size (#4170)

oxsecurity · Oct 20, 2024 · e13ac87 · e13ac87
1 parent 7ab9a2e
commit e13ac87
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 0 deletions.
diff --git a/.github/workflows/deploy-ALPHA-flavors.yml b/.github/workflows/deploy-ALPHA-flavors.yml
@@ -110,6 +110,7 @@ jobs:
             BUILD_DATE=${{ env.BUILD_DATE }}
             BUILD_REVISION=${{ github.sha }}
             BUILD_VERSION=alpha
+            --squash  # Enable image squashing to produce a single-layer image
           load: false
           push: true
           secrets: |
@@ -128,6 +129,7 @@ jobs:
             BUILD_DATE=${{ env.BUILD_DATE }}
             BUILD_REVISION=${{ github.sha }}
             BUILD_VERSION=alpha
+            --squash  # Enable image squashing to produce a single-layer image
           load: false
           push: true
           secrets: |

diff --git a/.github/workflows/deploy-ALPHA.yml b/.github/workflows/deploy-ALPHA.yml
@@ -99,6 +99,7 @@ jobs:
             BUILD_DATE=${{ env.BUILD_DATE }}
             BUILD_REVISION=${{ github.sha }}
             BUILD_VERSION=alpha
+            --squash  # Enable image squashing to produce a single-layer image
           load: false
           push: true
           secrets: |
@@ -117,6 +118,7 @@ jobs:
             BUILD_DATE=${{ env.BUILD_DATE }}
             BUILD_REVISION=${{ github.sha }}
             BUILD_VERSION=alpha
+            --squash  # Enable image squashing to produce a single-layer image
           load: false
           push: true
           secrets: |
@@ -136,6 +138,7 @@ jobs:
             BUILD_DATE=${{ env.BUILD_DATE }}
             BUILD_REVISION=${{ github.sha }}
             BUILD_VERSION=alpha
+            --squash  # Enable image squashing to produce a single-layer image
           load: false
           push: true
           secrets: |

diff --git a/.github/workflows/deploy-BETA-flavors.yml b/.github/workflows/deploy-BETA-flavors.yml
@@ -170,6 +170,7 @@ jobs:
             BUILD_DATE=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
             BUILD_VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
             BUILD_REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
+            --squash  # Enable image squashing to produce a single-layer image
           load: false
           push: ${{ github.event_name != 'pull_request' }}
           secrets: |
@@ -193,6 +194,7 @@ jobs:
             BUILD_DATE=${{ fromJSON(steps.meta-w.outputs.json).labels['org.opencontainers.image.created'] }}
             BUILD_VERSION=${{ fromJSON(steps.meta-w.outputs.json).labels['org.opencontainers.image.version'] }}
             BUILD_REVISION=${{ fromJSON(steps.meta-w.outputs.json).labels['org.opencontainers.image.revision'] }}
+            --squash  # Enable image squashing to produce a single-layer image
           load: false
           push: ${{ github.event_name != 'pull_request' }}
           secrets: |

diff --git a/.github/workflows/deploy-BETA-linters.yml b/.github/workflows/deploy-BETA-linters.yml
@@ -242,6 +242,7 @@ jobs:
             BUILD_DATE=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
             BUILD_VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
             BUILD_REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
+            --squash  # Enable image squashing to produce a single-layer image
           load: false
           push: ${{ github.event_name != 'pull_request' }}
           secrets: |

diff --git a/.github/workflows/deploy-BETA.yml b/.github/workflows/deploy-BETA.yml
@@ -157,6 +157,7 @@ jobs:
             BUILD_DATE=${{ fromJSON(steps.meta-s.outputs.json).labels['org.opencontainers.image.created'] }}
             BUILD_VERSION=${{ fromJSON(steps.meta-s.outputs.json).labels['org.opencontainers.image.version'] }}
             BUILD_REVISION=${{ fromJSON(steps.meta-s.outputs.json).labels['org.opencontainers.image.revision'] }}
+            --squash  # Enable image squashing to produce a single-layer image
           load: false
           push: ${{ github.event_name != 'pull_request' }}
           secrets: |
@@ -179,6 +180,7 @@ jobs:
             BUILD_DATE=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
             BUILD_VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
             BUILD_REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
+            --squash  # Enable image squashing to produce a single-layer image
           load: false
           push: ${{ github.event_name != 'pull_request' }}
           secrets: |
@@ -202,6 +204,7 @@ jobs:
             BUILD_DATE=${{ fromJSON(steps.meta-w.outputs.json).labels['org.opencontainers.image.created'] }}
             BUILD_VERSION=${{ fromJSON(steps.meta-w.outputs.json).labels['org.opencontainers.image.version'] }}
             BUILD_REVISION=${{ fromJSON(steps.meta-w.outputs.json).labels['org.opencontainers.image.revision'] }}
+            --squash  # Enable image squashing to produce a single-layer image
           load: false
           push: ${{ github.event_name != 'pull_request' }}
           secrets: |

diff --git a/.github/workflows/deploy-DEV-linters.yml b/.github/workflows/deploy-DEV-linters.yml
@@ -197,6 +197,7 @@ jobs:
             BUILD_DATE=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
             BUILD_VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
             BUILD_REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
+            --squash  # Enable image squashing to produce a single-layer image
           load: true
           push: false
           secrets: |

diff --git a/.github/workflows/deploy-DEV.yml b/.github/workflows/deploy-DEV.yml
@@ -92,6 +92,7 @@ jobs:
             BUILD_VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
             BUILD_REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
             MEGA_LINTER_BASE_IMAGE="oxsecurity/megalinter:beta"
+            --squash  # Enable image squashing to produce a single-layer image
           load: true
           push: false
           secrets: |
@@ -120,6 +121,7 @@ jobs:
             BUILD_DATE=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
             BUILD_VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
             BUILD_REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
+            --squash  # Enable image squashing to produce a single-layer image
           load: true
           push: false
           secrets: |
@@ -147,6 +149,7 @@ jobs:
             BUILD_DATE=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
             BUILD_VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
             BUILD_REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
+            --squash  # Enable image squashing to produce a single-layer image
           load: true
           push: false
           secrets: |

diff --git a/.github/workflows/deploy-RELEASE-flavors.yml b/.github/workflows/deploy-RELEASE-flavors.yml
@@ -98,6 +98,7 @@ jobs:
             BUILD_DATE=${{ env.BUILD_DATE }}
             BUILD_REVISION=${{ github.sha }}
             BUILD_VERSION=${{ github.event.release.tag_name }}
+            --squash  # Enable image squashing to produce a single-layer image
           load: false
           push: true
           secrets: |
@@ -134,6 +135,7 @@ jobs:
             BUILD_DATE=${{ env.BUILD_DATE }}
             BUILD_REVISION=${{ github.sha }}
             BUILD_VERSION=${{ github.event.release.tag_name }}
+            --squash  # Enable image squashing to produce a single-layer image
           load: false
           push: true
           secrets: |

diff --git a/.github/workflows/deploy-RELEASE-linters.yml b/.github/workflows/deploy-RELEASE-linters.yml
@@ -204,6 +204,7 @@ jobs:
             BUILD_DATE=${{ env.BUILD_DATE }}
             BUILD_REVISION=${{ github.sha }}
             BUILD_VERSION=${{ github.event.release.tag_name }}
+            --squash  # Enable image squashing to produce a single-layer image
           load: false
           push: true
           secrets: |

diff --git a/.github/workflows/deploy-RELEASE.yml b/.github/workflows/deploy-RELEASE.yml
@@ -94,6 +94,7 @@ jobs:
             BUILD_DATE=${{ env.BUILD_DATE }}
             BUILD_REVISION=${{ github.sha }}
             BUILD_VERSION=${{ github.event.release.tag_name }}
+            --squash  # Enable image squashing to produce a single-layer image
           load: false
           push: true
           secrets: |
@@ -130,6 +131,7 @@ jobs:
             BUILD_DATE=${{ env.BUILD_DATE }}
             BUILD_REVISION=${{ github.sha }}
             BUILD_VERSION=${{ github.event.release.tag_name }}
+            --squash  # Enable image squashing to produce a single-layer image
           load: false
           push: true
           secrets: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
 - CI
   - Also prune volumes before pulling and pushing to docker hub
   - Externalize mirroring from ghcr.io to docker hub in another workflow to avoid memory issues
+  - Squash docker images to have less layers and size
 
 - mega-linter-runner