Attempt to fix build failures

This commit is contained in:
Matthew Penner 2020-12-15 09:19:26 -07:00
parent f77900c682
commit 3d3201898f
12 changed files with 15 additions and 18 deletions

View file

@ -29,17 +29,15 @@ jobs:
- "java13" - "java13"
- "java14" - "java14"
- "java15" - "java15"
- "source" #- "source"
- "source-install" #- "source-install"
steps: steps:
- name: Code Checkout - name: Code Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Install buildx - name: Install buildx
uses: crazy-max/ghaction-docker-buildx@v1 uses: docker/setup-buildx-action@v1
with:
version: latest
- name: Registry Authentication - name: Registry Authentication
run: | run: |
@ -49,11 +47,10 @@ jobs:
env: env:
IMAGE_ID: docker.pkg.github.com/${{ github.repository }}/${{ matrix.image }}:latest IMAGE_ID: docker.pkg.github.com/${{ github.repository }}/${{ matrix.image }}:latest
run: | run: |
docker buildx build --tag $IMAGE_ID --platform linux/amd64,linux/arm64 ./${{ matrix.image }} docker buildx build --tag $IMAGE_ID --platform linux/amd64 ./${{ matrix.image }}
- name: Push Image - name: Push Image
env: env:
IMAGE_ID: docker.pkg.github.com/${{ github.repository }}/${{ matrix.image }}:latest IMAGE_ID: docker.pkg.github.com/${{ github.repository }}/${{ matrix.image }}:latest
run: | run: |
docker tag $IMAGE_ID $IMAGE_ID
docker push $IMAGE_ID docker push $IMAGE_ID

View file

@ -5,7 +5,7 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # https://github.com/matthewpi/images/blob/master/LICENSE.md
# #
FROM alpine:latest FROM --platform=$BUILDPLATFORM alpine:latest
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"

View file

@ -5,7 +5,7 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # https://github.com/matthewpi/images/blob/master/LICENSE.md
# #
FROM alpine:latest FROM --platform=$BUILDPLATFORM alpine:latest
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"

View file

@ -5,7 +5,7 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # https://github.com/matthewpi/images/blob/master/LICENSE.md
# #
FROM adoptopenjdk/openjdk10-openj9:alpine FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk10-openj9:alpine
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"

View file

@ -5,7 +5,7 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # https://github.com/matthewpi/images/blob/master/LICENSE.md
# #
FROM adoptopenjdk/openjdk11-openj9:alpine FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk11-openj9:alpine
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"

View file

@ -5,7 +5,7 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # https://github.com/matthewpi/images/blob/master/LICENSE.md
# #
FROM adoptopenjdk/openjdk12-openj9:alpine FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk12-openj9:alpine
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"

View file

@ -5,7 +5,7 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # https://github.com/matthewpi/images/blob/master/LICENSE.md
# #
FROM adoptopenjdk/openjdk13-openj9:alpine FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk13-openj9:alpine
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"

View file

@ -5,7 +5,7 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # https://github.com/matthewpi/images/blob/master/LICENSE.md
# #
FROM adoptopenjdk/openjdk14-openj9:alpine FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk14-openj9:alpine
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"

View file

@ -5,7 +5,7 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # https://github.com/matthewpi/images/blob/master/LICENSE.md
# #
FROM adoptopenjdk/openjdk15-openj9:alpine FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk15-openj9:alpine
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"

View file

@ -5,7 +5,7 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # https://github.com/matthewpi/images/blob/master/LICENSE.md
# #
FROM openjdk:7-jre-alpine FROM --platform=$BUILDPLATFORM openjdk:7-jre-alpine
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"

View file

@ -5,7 +5,7 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # https://github.com/matthewpi/images/blob/master/LICENSE.md
# #
FROM ibmjava:8-jre-alpine FROM --platform=$BUILDPLATFORM ibmjava:8-jre-alpine
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"

View file

@ -5,7 +5,7 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # https://github.com/matthewpi/images/blob/master/LICENSE.md
# #
FROM adoptopenjdk/openjdk9-openj9:alpine FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk9-openj9:alpine
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"