diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index d753862..8c5d7aa 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -49,11 +49,19 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.CR_PAT }} + - name: Login to Quay + uses: docker/login-action@v1 + with: + registry: quay.io + username: matthewp + password: ${{ secrets.QUAY_SECRET }} + - name: Build and Push uses: docker/build-push-action@v2 with: context: ./${{ matrix.image }} file: ./${{ matrix.image }}/Dockerfile platforms: linux/amd64,linux/arm64 - push: true - tags: ghcr.io/${{ github.repository_owner }}/${{ matrix.image }}:latest + tags: | + ghcr.io/${{ github.repository_owner }}/${{ matrix.image }}:latest + quay.io/matthewp/${{ matrix.image }}:latest diff --git a/alpine-install/Dockerfile b/alpine-install/Dockerfile index ac78f4a..610720c 100644 --- a/alpine-install/Dockerfile +++ b/alpine-install/Dockerfile @@ -9,4 +9,7 @@ FROM --platform=$BUILDPLATFORM alpine:latest LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" +LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +LABEL org.opencontainers.image.licenses=MIT + RUN apk add --update --no-cache ca-certificates curl jq wget diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 7b2dd12..584e36b 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -9,6 +9,9 @@ FROM --platform=$BUILDPLATFORM alpine:latest LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" +LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +LABEL org.opencontainers.image.licenses=MIT + RUN apk add --update --no-cache ca-certificates tzdata \ && adduser -D -h /home/container container diff --git a/java10/Dockerfile b/java10/Dockerfile index 8f4712b..215ac3c 100644 --- a/java10/Dockerfile +++ b/java10/Dockerfile @@ -9,6 +9,9 @@ FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk10-openj9:alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" +LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +LABEL org.opencontainers.image.licenses=MIT + RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \ && adduser -D -h /home/container container diff --git a/java11/Dockerfile b/java11/Dockerfile index a65b4b6..ada9a2d 100644 --- a/java11/Dockerfile +++ b/java11/Dockerfile @@ -9,6 +9,9 @@ FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk11-openj9:alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" +LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +LABEL org.opencontainers.image.licenses=MIT + RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \ && adduser -D -h /home/container container diff --git a/java12/Dockerfile b/java12/Dockerfile index 10a248d..0c82408 100644 --- a/java12/Dockerfile +++ b/java12/Dockerfile @@ -9,6 +9,9 @@ FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk12-openj9:alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" +LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +LABEL org.opencontainers.image.licenses=MIT + RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \ && adduser -D -h /home/container container diff --git a/java13/Dockerfile b/java13/Dockerfile index f583802..5548e07 100644 --- a/java13/Dockerfile +++ b/java13/Dockerfile @@ -9,6 +9,9 @@ FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk13-openj9:alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" +LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +LABEL org.opencontainers.image.licenses=MIT + RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \ && adduser -D -h /home/container container diff --git a/java14/Dockerfile b/java14/Dockerfile index b2302d1..976afe0 100644 --- a/java14/Dockerfile +++ b/java14/Dockerfile @@ -9,6 +9,9 @@ FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk14-openj9:alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" +LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +LABEL org.opencontainers.image.licenses=MIT + RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \ && adduser -D -h /home/container container diff --git a/java15/Dockerfile b/java15/Dockerfile index 3c82c13..d96c47c 100644 --- a/java15/Dockerfile +++ b/java15/Dockerfile @@ -9,6 +9,9 @@ FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk15-openj9:alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" +LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +LABEL org.opencontainers.image.licenses=MIT + RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \ && adduser -D -h /home/container container diff --git a/java7/Dockerfile b/java7/Dockerfile index 568e649..c78ab46 100644 --- a/java7/Dockerfile +++ b/java7/Dockerfile @@ -9,6 +9,9 @@ FROM --platform=$BUILDPLATFORM openjdk:7-jre-alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" +LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +LABEL org.opencontainers.image.licenses=MIT + RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \ && adduser -D -h /home/container container diff --git a/java8/Dockerfile b/java8/Dockerfile index f89f28e..35e10bf 100644 --- a/java8/Dockerfile +++ b/java8/Dockerfile @@ -9,6 +9,9 @@ FROM --platform=$BUILDPLATFORM ibmjava:8-jre-alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" +LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +LABEL org.opencontainers.image.licenses=MIT + RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \ && adduser -D -h /home/container container diff --git a/java9/Dockerfile b/java9/Dockerfile index 708fd3b..bd1dcbd 100644 --- a/java9/Dockerfile +++ b/java9/Dockerfile @@ -9,6 +9,9 @@ FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk9-openj9:alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" +LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +LABEL org.opencontainers.image.licenses=MIT + RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \ && adduser -D -h /home/container container diff --git a/source-install/Dockerfile b/source-install/Dockerfile index f503eff..1a9bbee 100644 --- a/source-install/Dockerfile +++ b/source-install/Dockerfile @@ -9,6 +9,9 @@ FROM debian:stable-slim LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" +LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +LABEL org.opencontainers.image.licenses=MIT + ENV DEBIAN_FRONTEND=noninteractive RUN dpkg --add-architecture i386 \ diff --git a/source/Dockerfile b/source/Dockerfile index edb9743..72da5d1 100644 --- a/source/Dockerfile +++ b/source/Dockerfile @@ -9,6 +9,9 @@ FROM debian:stable-slim LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" +LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +LABEL org.opencontainers.image.licenses=MIT + ENV DEBIAN_FRONTEND=noninteractive RUN dpkg --add-architecture i386 \