Skip to content

Commit 7f6d647

Browse files
committed
WIP
1 parent 4b036eb commit 7f6d647

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,18 @@ on:
99
activitypub-public-tags:
1010
description: ActivityPub Docker image tags for public registry
1111
value: ${{ jobs.build-main-images.outputs.activitypub-public-tags }}
12+
activitypub-public-labels:
13+
description: ActivityPub Docker image labels for public registry
14+
value: ${{ jobs.build-main-images.outputs.activitypub-public-labels }}
1215
migrations-private-tags:
1316
description: Migrations Docker image tags for private registry
1417
value: ${{ jobs.build-main-images.outputs.migrations-private-tags }}
1518
migrations-public-tags:
1619
description: Migrations Docker image tags for public registry
1720
value: ${{ jobs.build-main-images.outputs.migrations-public-tags }}
21+
migrations-public-labels:
22+
description: Migrations docker image labels for public registry
23+
value: ${{ jobs.build-main-images.outputs.migrations-public-labels }}
1824

1925
jobs:
2026
lint:
@@ -60,8 +66,10 @@ jobs:
6066
outputs:
6167
activitypub-private-tags: ${{ steps.activitypub-docker-metadata-private.outputs.tags }}
6268
activitypub-public-tags: ${{ steps.activitypub-docker-metadata-public.outputs.tags || '' }}
69+
activitypub-public-labels: ${{ steps.activitypub-docker-metadata-public.outputs.labels || '' }}
6370
migrations-private-tags: ${{ steps.migrations-docker-metadata.outputs.tags }}
6471
migrations-public-tags: ${{ steps.activitypub-migrations-docker-metadata-public.outputs.tags || '' }}
72+
migrations-public-labels: ${{ steps.activitypub-migrations-docker-metadata-public.outputs.labels || '' }}
6573
steps:
6674
- name: Checkout
6775
uses: actions/checkout@v4

.github/workflows/push.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ jobs:
5858
with:
5959
context: .
6060
push: true
61-
tags: ${{ inputs.activitypub-docker-metadata-private.outputs.tags }}
62-
labels: ${{ inputs.activitypub-docker-metadata-private.outputs.labels }}
61+
tags: ${{ inputs.activitypub-private-tags }}
62+
labels: ${{ inputs.activitypub-private-labels }}
6363
platforms: linux/amd64
6464

6565
- name: Push ActivityPub Docker image to public registry
@@ -68,23 +68,23 @@ jobs:
6868
with:
6969
context: .
7070
push: true
71-
tags: ${{ inputs.activitypub-docker-metadata-public.outputs.tags }}
72-
labels: ${{ inputs.activitypub-docker-metadata-public.outputs.labels }}
71+
tags: ${{ inputs.activitypub-public-tags }}
72+
labels: ${{ inputs.activitypub-public-labels }}
7373
platforms: linux/amd64
7474

7575
- name: Push Migrations Docker image to private registry
7676
uses: docker/build-push-action@v6
7777
with:
7878
context: migrate
7979
push: true
80-
tags: ${{ inputs.migrations-docker-metadata.outputs.tags }}
80+
tags: ${{ inputs.activitypub-migrations-private-tags }}
8181

8282
- name: Push Migrations Docker image to public registry
8383
if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')
8484
uses: docker/build-push-action@v6
8585
with:
8686
context: migrate
8787
push: true
88-
tags: ${{ inputs.activitypub-migrations-docker-metadata-public.outputs.tags }}
89-
labels: ${{ inputs.activitypub-migrations-docker-metadata-public.outputs.labels }}
88+
tags: ${{ inputs.activitypub-migrations-public-tags }}
89+
labels: ${{ inputs.activitypub-migrations-public-labels }}
9090
platforms: linux/amd64

0 commit comments

Comments
 (0)