From d5d82d6ff787ce4d6f402ac10b789da2666e9501 Mon Sep 17 00:00:00 2001
From: Dan Anglin <daangling@gmail.com>
Date: Tue, 1 Feb 2022 21:50:43 +0000
Subject: [PATCH] ci: update Dockerfile and hadolint

---
 .gitlab/ci/docker-gitlab-ci.yml |  2 +-
 .hadolint.yaml                  |  2 ++
 docker/Dockerfile               | 15 ++++++---------
 3 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 .hadolint.yaml

diff --git a/.gitlab/ci/docker-gitlab-ci.yml b/.gitlab/ci/docker-gitlab-ci.yml
index 2ebeefb..3956f2d 100644
--- a/.gitlab/ci/docker-gitlab-ci.yml
+++ b/.gitlab/ci/docker-gitlab-ci.yml
@@ -11,7 +11,7 @@
 
 .dockerfile-lint:
   stage: test
-  image: hadolint/hadolint:v1.18.0-alpine
+  image: hadolint/hadolint:v2.8.0-alpine
   script:
   - "hadolint docker/Dockerfile"
 
diff --git a/.hadolint.yaml b/.hadolint.yaml
new file mode 100644
index 0000000..afcc8b3
--- /dev/null
+++ b/.hadolint.yaml
@@ -0,0 +1,2 @@
+ignored:
+- DL3015
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 907bd7e..7c33665 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15.2-buster AS builder
+FROM golang:1.17.6-buster AS builder
 
 RUN git clone https://github.com/magefile/mage "${GOPATH}/src/mage"
 
@@ -22,11 +22,11 @@ COPY --from=builder /usr/local/bin/cv-make /usr/local/bin
 # Install dependencies
 RUN \
     apt-get update && \
-    apt-get install -y --no-install-recommends \
+    apt-get install -y \
         fonts-crosextra-carlito=20130920-1 \
         rsync=3.1.3-6 \
-        curl=7.64.0-4+deb10u1 \
-        aspell=0.60.7~20110707-6 \
+        curl=7.64.0-4+deb10u2 \
+        aspell=0.60.7~20110707-6+deb10u1 \
         aspell-en=2018.04.16-0-1 \
     && \
     apt-get clean autoclean && \
@@ -38,11 +38,8 @@ WORKDIR /opt/context
 
 # Install ConTeXt standalone
 RUN \
-    curl -L http://minimals.contextgarden.net/setup/first-setup.sh -o /opt/context/first-setup.sh && \
-    sh /opt/context/first-setup.sh \
-        --context=current \
-        --engine=luatex \
-    && \
+    curl -LO http://minimals.contextgarden.net/setup/first-setup.sh && \
+    sh first-setup.sh --context=current --engine=luatex && \
     rm -rf /opt/context/tex/texmf-context/doc
 
 ENV PATH=${PATH}:/opt/context/tex/texmf-linux-64/bin \