Skip to content

Commit 251851e

Browse files
committed
Try to get Docker images to build for both architectures
1 parent 049a669 commit 251851e

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.github/workflows/docker-arm.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Snipe-IT Docker image build for hub.docker.com
2-
name: Docker ARM64 images (Ubuntu)
2+
name: Docker cross-platform images (Ubuntu and Alpine)
33

44
# Run this Build for all pushes to 'master' or develop branch, or tagged releases.
55
# Also run for PRs to ensure PR doesn't break Docker build process
@@ -19,10 +19,10 @@ permissions:
1919
contents: read
2020

2121
jobs:
22-
docker-ubuntu-arm:
22+
docker-ubuntu:
2323
# Ensure this job never runs on forked repos. It's only executed for 'grokability/snipe-it'
2424
if: github.repository == 'grokability/snipe-it'
25-
runs-on: ubuntu-24.04-arm
25+
runs-on: ubuntu-latest
2626
env:
2727
# Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
2828
# For a new commit on default branch (master), use the literal tag 'latest' on Docker image.
@@ -77,17 +77,17 @@ jobs:
7777
with:
7878
context: .
7979
file: ./Dockerfile
80-
platforms: linux/arm64
80+
platforms: linux/arm64,linux/amd64
8181
# For pull requests, we run the Docker build (to ensure no PR changes break the build),
8282
# but we ONLY do an image push to DockerHub if it's NOT a PR
8383
push: ${{ github.event_name != 'pull_request' }}
8484
# Use tags / labels provided by 'docker/metadata-action' above
8585
tags: ${{ steps.meta_build.outputs.tags }}
8686
labels: ${{ steps.meta_build.outputs.labels }}
87-
docker-alpine-arm:
87+
docker-alpine:
8888
# Ensure this job never runs on forked repos. It's only executed for 'grokability/snipe-it'
8989
if: github.repository == 'grokability/snipe-it'
90-
runs-on: ubuntu-24.04-arm
90+
runs-on: ubuntu-latest
9191
env:
9292
# Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
9393
# For a new commit on default branch (master), use the literal tag 'latest' on Docker image.
@@ -142,7 +142,7 @@ jobs:
142142
with:
143143
context: .
144144
file: ./Dockerfile.alpine
145-
platforms: linux/arm64
145+
platforms: linux/arm64,linux/amd64
146146
# For pull requests, we run the Docker build (to ensure no PR changes break the build),
147147
# but we ONLY do an image push to DockerHub if it's NOT a PR
148148
push: ${{ github.event_name != 'pull_request' }}

0 commit comments

Comments
 (0)