Skip to content

Commit

Permalink
Add hadolint
Browse files Browse the repository at this point in the history
  • Loading branch information
joecorall committed Apr 26, 2024
1 parent 227eeef commit 175dbf2
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 16 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/build-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@ jobs:
contents: read
id-token: write
steps:

- uses: 'actions/checkout@v4'

- uses: hadolint/[email protected]
with:
dockerfile: ${{ inputs.dockerFile }}
verbose: true

- name: Extract branch name as docker tag
shell: bash
run: |-
Expand Down
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ FROM golang:1.21-alpine
WORKDIR /app

RUN apk update && \
apk add curl bash ca-certificates && \
apk add --no-cache \
curl==8.5.0-r0 \
bash==5.2.21-r0 \
ca-certificates==20230506-r0 && \
update-ca-certificates

COPY . ./
Expand Down
2 changes: 1 addition & 1 deletion docker-images/curl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ ARG DOCKER_REPOSITORY=local
FROM ${DOCKER_REPOSITORY}/scyllaridae:${TAG}

RUN apk update && \
apk add --no-cache curl
apk add --no-cache curl==8.5.0-r0

COPY scyllaridae.yml /app/scyllaridae.yml
2 changes: 1 addition & 1 deletion docker-images/ffmpeg/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ ARG DOCKER_REPOSITORY=local
FROM ${DOCKER_REPOSITORY}/scyllaridae:${TAG}

RUN apk update && \
apk add --no-cache ffmpeg
apk add --no-cache ffmpeg==6.1.1-r0

COPY scyllaridae.yml /app/scyllaridae.yml
2 changes: 1 addition & 1 deletion docker-images/fits/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ ARG DOCKER_REPOSITORY=local
FROM ${DOCKER_REPOSITORY}/scyllaridae:${TAG}

RUN apk update && \
apk add --no-cache curl
apk add --no-cache curl==8.5.0-r0

COPY scyllaridae.yml /app/scyllaridae.yml
2 changes: 1 addition & 1 deletion docker-images/imagemagick/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ ARG DOCKER_REPOSITORY=local
FROM ${DOCKER_REPOSITORY}/scyllaridae:${TAG}

RUN apk update && \
apk add --no-cache imagemagick
apk add --no-cache imagemagick==7.1.1.26-r0

COPY scyllaridae.yml /app/scyllaridae.yml
24 changes: 13 additions & 11 deletions docker-images/tesseract/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@ ARG TAG=main
ARG DOCKER_REPOSITORY=local
FROM ${DOCKER_REPOSITORY}/scyllaridae:${TAG}

ARG TESSERACT_VERSION=5.3.3-r1

RUN apk update && \

Check failure on line 7 in docker-images/tesseract/Dockerfile

View workflow job for this annotation

GitHub Actions / build-push (docker-images/tesseract/Dockerfile) / build-push-ar

DL3018 warning: Pin versions in apk add. Instead of `apk add <package>` use `apk add <package>=<version>`
apk add --no-cache leptonica-dev \
tesseract-ocr \
tesseract-ocr-data-eng \
tesseract-ocr-data-fra \
tesseract-ocr-data-spa \
tesseract-ocr-data-ita \
tesseract-ocr-data-por \
tesseract-ocr-data-hin \
tesseract-ocr-data-deu \
tesseract-ocr-data-jpn \
tesseract-ocr-data-rus \
poppler-utils
tesseract-ocr==${TESSERACT_VERSION} \
tesseract-ocr-data-eng==${TESSERACT_VERSION} \
tesseract-ocr-data-fra==${TESSERACT_VERSION} \
tesseract-ocr-data-spa==${TESSERACT_VERSION} \
tesseract-ocr-data-ita==${TESSERACT_VERSION} \
tesseract-ocr-data-por==${TESSERACT_VERSION} \
tesseract-ocr-data-hin==${TESSERACT_VERSION} \
tesseract-ocr-data-deu==${TESSERACT_VERSION} \
tesseract-ocr-data-jpn==${TESSERACT_VERSION} \
tesseract-ocr-data-rus==${TESSERACT_VERSION} \
poppler-utils==23.10.0-r0

COPY scyllaridae.yml /app/scyllaridae.yml

0 comments on commit 175dbf2

Please sign in to comment.