Skip to content

Commit

Permalink
Create sample docker images (#3)
Browse files Browse the repository at this point in the history
  • Loading branch information
joecorall authored Apr 26, 2024
1 parent 56d8976 commit d31ff2e
Show file tree
Hide file tree
Showing 16 changed files with 370 additions and 23 deletions.
6 changes: 6 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
docker-images
scyllaridae
.git
.github


76 changes: 76 additions & 0 deletions .github/workflows/build-push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: build-push-ar
on:
workflow_call:
inputs:
dockerFile:
required: true
type: string
jobs:
build-push-ar:
runs-on: ubuntu-latest
timeout-minutes: 15
permissions:
contents: read
id-token: write
steps:
- uses: 'actions/checkout@v4'

- name: Extract branch name as docker tag
shell: bash
run: |-
BRANCH=$(echo "${GITHUB_REF#refs/heads/}" | sed 's/[^a-zA-Z0-9._-]//g' | awk '{print substr($0, length($0)-120)}')
echo "branch=$BRANCH" >> $GITHUB_OUTPUT
id: extract_branch

- name: Extract tag name
shell: bash
run: |-
t=$(echo ${GITHUB_SHA} | cut -c1-7)
echo "tag=$t" >> $GITHUB_OUTPUT
id: extract_tag

- name: Setup docker build
shell: bash
run: |-
# aka base build
if [ ${{ inputs.dockerFile }} == "Dockerfile" ]; then
echo "image=scyllaridae" >> $GITHUB_OUTPUT
exit 0
fi
# put the YML file in place so it's copied into the Docker container
DIR=$(dirname "${{ inputs.dockerFile }}")
cp ./$DIR/scyllaridae.yml .
# name the docker image after the folder name prefixed by scyllaridae
# e.g. scyllaridae-curl
echo "image=scyllaridae-$(basename $DIR)" >> $GITHUB_OUTPUT
id: setup

- id: 'auth'
name: 'Authenticate to Google Cloud'
uses: 'google-github-actions/auth@v1'
with:
workload_identity_provider: ${{ secrets.GCLOUD_OIDC_POOL }}
create_credentials_file: true
service_account: ${{ secrets.GSA }}
token_format: 'access_token'

- uses: 'docker/login-action@v3'
name: 'Docker login'
with:
registry: 'us-docker.pkg.dev'
username: 'oauth2accesstoken'
password: '${{ steps.auth.outputs.access_token }}'

- name: Build and push
uses: docker/build-push-action@v5
with:
context: .
file: ${{ inputs.dockerFile }}
build-args: |
TAG=${{steps.extract_branch.outputs.branch}}
DOCKER_REPOSITORY=us-docker.pkg.dev/${{ secrets.GCLOUD_PROJECT }}/public
push: true
tags: |
us-docker.pkg.dev/${{ secrets.GCLOUD_PROJECT }}/public/${{steps.setup.outputs.image}}:${{steps.extract_branch.outputs.branch}}-${{steps.extract_tag.outputs.tag}}
us-docker.pkg.dev/${{ secrets.GCLOUD_PROJECT }}/public/${{steps.setup.outputs.image}}:${{steps.extract_branch.outputs.branch}}
71 changes: 71 additions & 0 deletions .github/workflows/lint-test-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: lint-test
on:
push:

permissions:
contents: read

jobs:

lint-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: actions/setup-go@v4

- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.54

- name: Install dependencies
run: go get .

- name: Build
run: go build -v ./...

- name: Put fixture in place
run: cp scyllaridae.example.yml scyllaridae.yml

- name: Test with the Go CLI
run: go test -v ./...

build-push-base:
needs: [lint-test]
uses: ./.github/workflows/build-push.yml
with:
dockerFile: Dockerfile
permissions:
contents: read
id-token: write
secrets: inherit

find-images:
needs: [build-push-base]
name: Find docker images needing built
runs-on: ubuntu-latest
outputs:
dockerFiles: ${{ steps.images.outputs.dockerFiles }}
steps:
- uses: actions/checkout@v4
- name: Find docker files
id: images
run: |
dockerFiles=$(find docker-images -name Dockerfile | jq -c --raw-input --slurp 'split("\n")| .[0:-1]')
echo "dockerFiles=$dockerFiles" >> $GITHUB_OUTPUT
env:
GITHUB_REF: ${{ github.ref }}

build-push:
needs: [find-images]
strategy:
matrix:
dockerFile: ${{ fromJson(needs.find-images.outputs.dockerFiles )}}
uses: ./.github/workflows/build-push.yml
with:
dockerFile: ${{ matrix.dockerFile }}
permissions:
contents: read
id-token: write
secrets: inherit
23 changes: 0 additions & 23 deletions .github/workflows/lint-test.yml

This file was deleted.

15 changes: 15 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM golang:1.21-alpine

WORKDIR /app

RUN apk update && \
apk add openssl && \
openssl s_client -connect helloworld.letsencrypt.org:443 -showcerts </dev/null 2>/dev/null | sed -e '/-----BEGIN/,/-----END/!d' | tee "/usr/local/share/ca-certificates/ca.crt" >/dev/null && \
update-ca-certificates

COPY . ./
RUN go mod download && \
go build -o /app/scyllaridae && \
go clean -cache -modcache

ENTRYPOINT ["/app/scyllaridae"]
8 changes: 8 additions & 0 deletions docker-images/curl/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ARG TAG=main
ARG DOCKER_REPOSITORY=local
FROM ${DOCKER_REPOSITORY}/scyllaridae:${TAG}

RUN apk update && \
apk add --no-cache curl

COPY scyllaridae.yml /app/scyllaridae.yml
8 changes: 8 additions & 0 deletions docker-images/curl/scyllaridae.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
destinationHttpMethod: GET
forwardAuth: false
allowedMimeTypes: [
"text/html"
]
cmdByMimeType:
default:
cmd: "curl"
8 changes: 8 additions & 0 deletions docker-images/ffmpeg/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ARG TAG=main
ARG DOCKER_REPOSITORY=local
FROM ${DOCKER_REPOSITORY}/scyllaridae:${TAG}

RUN apk update && \
apk add --no-cache ffmpeg

COPY scyllaridae.yml /app/scyllaridae.yml
98 changes: 98 additions & 0 deletions docker-images/ffmpeg/scyllaridae.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
destinationHttpMethod: PUT
allowedMimeTypes: [
"audio/*",
"video/*",
"image/jpeg",
"image/png"
]
cmdByMimeType:
"video/x-msvideo"
cmd: "ffmpeg"
args: [
"-i",
"-",
"%s",
"-f",
"avi"
]
"video/ogg"
cmd: "ffmpeg"
args: [
"-i",
"-",
"%s",
"-f",
"ogg"
]
"audio/x-wav"
cmd: "ffmpeg"
args: [
"-i",
"-",
"%s",
"-f",
"wav"
]
"audio/mpeg"
cmd: "ffmpeg"
args: [
"-i",
"-",
"%s",
"-f",
"mp3"
]
"audio/aac"
cmd: "ffmpeg"
args: [
"-i",
"-",
"%s",
"-f",
"m4a"
]
"image/jpeg"
cmd: "ffmpeg"
args: [
"-i",
"-",
"%s",
"-f",
"image2pipe"
]
"image/png"
cmd: "ffmpeg"
args: [
"-i",
"-",
"%s",
"-f",
"image2pipe"
]
"video/mp4":
cmd: "ffmpeg"
args: [
"-i",
"-",
"%s",
"-vcodec",
"libx264",
"-preset",
"medium",
"-acodec",
"aac",
"-strict",
"-2",
"-ab",
"128k",
"-ac",
"2",
"-async",
"1",
"-movflags",
"faststart",
"-y",
"-f",
"mp4",
"-"
]
8 changes: 8 additions & 0 deletions docker-images/fits/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ARG TAG=main
ARG DOCKER_REPOSITORY=local
FROM ${DOCKER_REPOSITORY}/scyllaridae:${TAG}

RUN apk update && \
apk add --no-cache curl

COPY scyllaridae.yml /app/scyllaridae.yml
15 changes: 15 additions & 0 deletions docker-images/fits/scyllaridae.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
destinationHttpMethod: GET
forwardAuth: false
allowedMimeTypes: [
"*"
]
cmdByMimeType:
default:
cmd: "curl"
args: [
"http://fits:8080/fits/examine",
"-X",
"POST",
"-F",
"datafile=@-"
]
8 changes: 8 additions & 0 deletions docker-images/imagemagick/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ARG TAG=main
ARG DOCKER_REPOSITORY=local
FROM ${DOCKER_REPOSITORY}/scyllaridae:${TAG}

RUN apk update && \
apk add --no-cache imagemagick

COPY scyllaridae.yml /app/scyllaridae.yml
7 changes: 7 additions & 0 deletions docker-images/imagemagick/scyllaridae.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
destinationHttpMethod: PUT
allowedMimeTypes: [
"text/html"
]
cmdByMimeType:
default:
cmd: "convert"
19 changes: 19 additions & 0 deletions docker-images/tesseract/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
ARG TAG=main
ARG DOCKER_REPOSITORY=local
FROM ${DOCKER_REPOSITORY}/scyllaridae:${TAG}

RUN apk update && \
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

COPY scyllaridae.yml /app/scyllaridae.yml
Loading

0 comments on commit d31ff2e

Please sign in to comment.