Merge branch 'reduce-docker-image-layers' into 'master'

Reduce docker image layers

See merge request salsa-ci-team/ci-image-git-buildpackage!5

.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

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
@@ -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/
+ADD overlay /
-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/
 
 ENTRYPOINT ["/usr/bin/gitlab-ci-entrypoint"]