From 6ae3bc0b84894500ab8357dec3d945d9d666e136 Mon Sep 17 00:00:00 2001 From: You-Sheng Yang Date: Tue, 13 Nov 2018 14:09:43 +0800 Subject: [PATCH 1/2] reduce built docker image layers --- .gitlab-ci.yml | 2 +- Dockerfile | 11 +---------- .../usr/bin/gitlab-ci-add-pages-repo | 0 gitlab-ci-aptly => overlay/usr/bin/gitlab-ci-aptly | 0 .../usr/bin/gitlab-ci-autopkgtest | 0 .../usr/bin/gitlab-ci-enable-experimental | 0 .../usr/bin/gitlab-ci-enable-sid | 0 .../usr/bin/gitlab-ci-entrypoint | 0 .../usr/bin/gitlab-ci-git-buildpackage | 0 .../usr/bin/gitlab-ci-git-buildpackage-all | 0 .../usr/bin/gitlab-ci-lintian | 0 .../usr/share/gitlab-ci-common | 0 12 files changed, 2 insertions(+), 11 deletions(-) rename gitlab-ci-add-pages-repo => overlay/usr/bin/gitlab-ci-add-pages-repo (100%) rename gitlab-ci-aptly => overlay/usr/bin/gitlab-ci-aptly (100%) rename gitlab-ci-autopkgtest => overlay/usr/bin/gitlab-ci-autopkgtest (100%) rename gitlab-ci-enable-experimental => overlay/usr/bin/gitlab-ci-enable-experimental (100%) rename gitlab-ci-enable-sid => overlay/usr/bin/gitlab-ci-enable-sid (100%) rename gitlab-ci-entrypoint => overlay/usr/bin/gitlab-ci-entrypoint (100%) rename gitlab-ci-git-buildpackage => overlay/usr/bin/gitlab-ci-git-buildpackage (100%) rename gitlab-ci-git-buildpackage-all => overlay/usr/bin/gitlab-ci-git-buildpackage-all (100%) rename gitlab-ci-lintian => overlay/usr/bin/gitlab-ci-lintian (100%) rename gitlab-ci-common => overlay/usr/share/gitlab-ci-common (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd37741..9038572 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ build: stage: build script: - apk add --no-cache bash - - /bin/bash -n gitlab-ci-* + - /bin/bash -n overlay/usr/share/gitlab-ci-common overlay/usr/bin/gitlab-ci-* - echo Building ${RELEASE_IMAGE} - docker build -t $TEST_IMAGE . - docker push $TEST_IMAGE diff --git a/Dockerfile b/Dockerfile index cedae9b..88df23c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,15 +29,6 @@ RUN mkdir -p /usr/share/man/man1 \ && apt-mark auto $build_deps \ && rm -rf /var/lib/apt/lists/* -COPY gitlab-ci-common /usr/share/ -COPY gitlab-ci-add-pages-repo /usr/bin/ -COPY gitlab-ci-aptly /usr/bin/ -COPY gitlab-ci-autopkgtest /usr/bin/ -COPY gitlab-ci-entrypoint /usr/bin/ -COPY gitlab-ci-git-buildpackage /usr/bin/ -COPY gitlab-ci-git-buildpackage-all /usr/bin/ -COPY gitlab-ci-lintian /usr/bin/ -COPY gitlab-ci-enable-sid /usr/bin/ -COPY gitlab-ci-enable-experimental /usr/bin/ +ADD overlay / ENTRYPOINT ["/usr/bin/gitlab-ci-entrypoint"] diff --git a/gitlab-ci-add-pages-repo b/overlay/usr/bin/gitlab-ci-add-pages-repo similarity index 100% rename from gitlab-ci-add-pages-repo rename to overlay/usr/bin/gitlab-ci-add-pages-repo diff --git a/gitlab-ci-aptly b/overlay/usr/bin/gitlab-ci-aptly similarity index 100% rename from gitlab-ci-aptly rename to overlay/usr/bin/gitlab-ci-aptly diff --git a/gitlab-ci-autopkgtest b/overlay/usr/bin/gitlab-ci-autopkgtest similarity index 100% rename from gitlab-ci-autopkgtest rename to overlay/usr/bin/gitlab-ci-autopkgtest diff --git a/gitlab-ci-enable-experimental b/overlay/usr/bin/gitlab-ci-enable-experimental similarity index 100% rename from gitlab-ci-enable-experimental rename to overlay/usr/bin/gitlab-ci-enable-experimental diff --git a/gitlab-ci-enable-sid b/overlay/usr/bin/gitlab-ci-enable-sid similarity index 100% rename from gitlab-ci-enable-sid rename to overlay/usr/bin/gitlab-ci-enable-sid diff --git a/gitlab-ci-entrypoint b/overlay/usr/bin/gitlab-ci-entrypoint similarity index 100% rename from gitlab-ci-entrypoint rename to overlay/usr/bin/gitlab-ci-entrypoint diff --git a/gitlab-ci-git-buildpackage b/overlay/usr/bin/gitlab-ci-git-buildpackage similarity index 100% rename from gitlab-ci-git-buildpackage rename to overlay/usr/bin/gitlab-ci-git-buildpackage diff --git a/gitlab-ci-git-buildpackage-all b/overlay/usr/bin/gitlab-ci-git-buildpackage-all similarity index 100% rename from gitlab-ci-git-buildpackage-all rename to overlay/usr/bin/gitlab-ci-git-buildpackage-all diff --git a/gitlab-ci-lintian b/overlay/usr/bin/gitlab-ci-lintian similarity index 100% rename from gitlab-ci-lintian rename to overlay/usr/bin/gitlab-ci-lintian diff --git a/gitlab-ci-common b/overlay/usr/share/gitlab-ci-common similarity index 100% rename from gitlab-ci-common rename to overlay/usr/share/gitlab-ci-common From d5662634ef12078a20e2a97985ec6a2a4af826d5 Mon Sep 17 00:00:00 2001 From: You-Sheng Yang Date: Tue, 13 Nov 2018 14:24:21 +0800 Subject: [PATCH 2/2] use LABEL instead of deprecated MAINTAINER directive --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 88df23c..1aa28fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM debian:testing -MAINTAINER hans@eds.org +LABEL maintainer="hans@eds.org" ENV LANG=C.UTF-8 \ DEBIAN_FRONTEND=noninteractive