From 0ad84af7b75714cbfa85a88da4b28fe25befe45c Mon Sep 17 00:00:00 2001
From: Justin Kromlinger <hashworks@archlinux.org>
Date: Mon, 2 Nov 2020 20:03:42 +0100
Subject: [PATCH] Drop alpine version pins, ignore DL3018

https://gitlab.archlinux.org/archlinux/archlinux-docker/-/merge_requests/47#note_6125
---
 .gitlab-ci.yml      | 3 ++-
 Dockerfile.template | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e8935a5..0c242a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,8 @@ 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 DL3007 --ignore DL3018 --ignore DL3020 Dockerfile.template
   except:
     - releases
     - tags
diff --git a/Dockerfile.template b/Dockerfile.template
index 22113b4..363fb71 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -10,7 +10,7 @@
 # allow us to automate the releaes process.
 FROM alpine:3.12 AS verify
 COPY TEMPLATE_ROOTFS_FILE /
-RUN apk update && apk add --no-cache curl=7.69.1-r1 bash=5.0.17-r0
+RUN apk update && apk add --no-cache curl bash
 SHELL ["/bin/bash", "-c"]
 RUN ROOTFS="$(curl -sOJL --continue-at - -w "%{filename_effective}" TEMPLATE_ROOTFS_URL)" && \
     sha256sum -c <<< "TEMPLATE_ROOTFS_HASH" && \