Skip to content

Commit 999ea44

Browse files
committed
Consolidating docker builds into single file. Temporarily disabling arm
1 parent d4d800f commit 999ea44

File tree

3 files changed

+25
-59
lines changed

3 files changed

+25
-59
lines changed

.github/workflows/dockerhub-push.yml

-32
This file was deleted.

.github/workflows/dockerhub-sysd-push.yml

-25
This file was deleted.

.github/workflows/dockerhub-arm64-push.yml .github/workflows/publish_docker.yml

+25-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
env:
1515
REGISTRY: ghcr.io
1616
# github.repository as <account>/<repo>
17-
IMAGE_BASE: ${{ github.repository }}
17+
IMAGE_BASE: 'perfsonar/testpoint'
1818
BUILD_DIR: .
1919

2020
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
@@ -58,6 +58,18 @@ jobs:
5858
type=ref,event=pr
5959
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
6060
61+
- name: Extract Systemd Docker metadata
62+
id: metasysd
63+
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
64+
with:
65+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_BASE }}
66+
tags: |
67+
type=schedule,suffix=-systemd
68+
type=ref,event=branch,suffix=-systemd
69+
type=ref,event=tag,suffix=-systemd
70+
type=ref,event=pr,suffix=-systemd
71+
type=raw,value=systemd,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
72+
6173
# Build and push Docker image with Buildx (don't push on PR)
6274
# https://github.com/docker/build-push-action
6375
- name: Build and push Docker images
@@ -69,4 +81,15 @@ jobs:
6981
push: ${{ github.event_name != 'pull_request' }}
7082
tags: ${{ steps.meta.outputs.tags }}
7183
labels: ${{ steps.meta.outputs.labels }}
72-
platforms: linux/amd64,linux/arm/v7
84+
platforms: linux/amd64
85+
86+
- name: Build and push Systemd Docker images
87+
id: build-and-push-systemd
88+
uses: docker/build-push-action@v6
89+
with:
90+
context: ${{ env.BUILD_DIR }}
91+
file: ${{ env.BUILD_DIR }}/systemd/Dockerfile
92+
push: ${{ github.event_name != 'pull_request' }}
93+
tags: ${{ steps.metasysd.outputs.tags }}
94+
labels: ${{ steps.metasysd.outputs.labels }}
95+
platforms: linux/amd64

0 commit comments

Comments
 (0)