From dee6413cfe378b9790773f847d3c9e9866c04cab Mon Sep 17 00:00:00 2001 From: Poncho <poncho@spahan.ch> Date: Tue, 12 May 2020 13:32:27 +0200 Subject: [PATCH] Dockerfile: reduce size, add linting --- .gitlab-ci.yml | 15 ++++++++++++--- Dockerfile | 5 +++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb53edc..17327ae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,18 @@ -image: - name: gcr.io/kaniko-project/executor:debug - entrypoint: [""] +stages: + - lint + - build + +lint: + stage: lint + image: hadolint/hadolint:latest-debian + script: + - hadolint Dockerfile build: stage: build + image: + name: gcr.io/kaniko-project/executor:debug + entrypoint: [""] script: - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA --destination $CI_REGISTRY_IMAGE:latest diff --git a/Dockerfile b/Dockerfile index 2229e2d..02f6708 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,8 +7,9 @@ ENV ACCEPT_KEYWORDS="~amd64" \ EMERGE_DEFAULT_OPTS="--jobs=4 --quiet" \ FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox" \ MAKEOPTS="-j4" \ - USE="-perl" + USE="-perl -ipc -rsync-verify" # https://github.com/gentoo/gentoo-docker-images/issues/79 -RUN emerge --unmerge dev-python/setuptools dev-python/certifi \ +RUN emerge --unmerge dev-python/setuptools dev-python/certifi \ && emerge dev-vcs/git app-portage/repoman dev-util/pkgcheck + && rm -rf /var/cache/distfiles/* -- GitLab