ci: update Dockerfile and hadolint

This commit is contained in:
Dan Anglin 2022-02-01 21:50:43 +00:00
parent bf8ede4bde
commit d5d82d6ff7
Signed by: dananglin
GPG key ID: 0C1D44CFBEE68638
3 changed files with 9 additions and 10 deletions

View file

@ -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"

2
.hadolint.yaml Normal file
View file

@ -0,0 +1,2 @@
ignored:
- DL3015

View file

@ -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 \