diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e8935a5..99d870e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,8 +12,8 @@ stages: lint: stage: lint image: hadolint/hadolint:latest - # DL3007: We use the latest tag for multistage build - script: hadolint --ignore DL3007 --ignore DL3020 Dockerfile.template + # DL3018: We don't need alpine version pins + script: hadolint --ignore DL3018 Dockerfile.template except: - releases - tags diff --git a/Dockerfile.template b/Dockerfile.template index ad79c50..1ddf356 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -8,13 +8,14 @@ # The second stage is for actually configuring the system a little bit. # Some templating is done in order to allow us to easily build different configurations and to # allow us to automate the releaes process. -FROM archlinux:latest AS verify +FROM alpine:3.12 AS verify COPY TEMPLATE_ROOTFS_FILE / +RUN apk add --no-cache curl bash SHELL ["/bin/bash", "-c"] -RUN ROOTFS="$(curl -OJL --continue-at - -w "%{filename_effective}" TEMPLATE_ROOTFS_URL)" && \ +RUN ROOTFS="$(curl -sOJL --continue-at - -w "%{filename_effective}" TEMPLATE_ROOTFS_URL)" && \ sha256sum -c <<< "TEMPLATE_ROOTFS_HASH" && \ mkdir /rootfs && \ - tar -C /rootfs --extract --auto-compress --file "${ROOTFS}" + tar -C /rootfs --extract --file "${ROOTFS}" FROM scratch AS root COPY --from=verify /rootfs/ /