Skip to content

Commit 986b382

Browse files
rwaffenrwaffen
authored
Merge pull request #55 from OpenVoxProject/fix-tagging
fix: streamline server and db version handling in build workflow
2 parents 35b50d9 + 048609b commit 986b382

1 file changed

Lines changed: 26 additions & 49 deletions

File tree

‎.github/workflows/build_container.yml‎

Lines changed: 26 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ jobs:
1313
runs-on: ubuntu-latest
1414
outputs:
1515
matrix: ${{ steps.set-matrix.outputs.matrix }}
16-
server_version: ${{ steps.server_version.outputs.server_version }}
17-
db_version: ${{ steps.db_version.outputs.db_version }}
1816
steps:
1917
- name: Source checkout
2018
uses: actions/checkout@v4
@@ -25,12 +23,6 @@ jobs:
2523
- id: set-matrix
2624
run: echo "matrix=$(yq -o json build_versions.yaml | jq -c)" >> $GITHUB_OUTPUT
2725

28-
- id: server_version
29-
run: echo "server_version=$(yq '.include[1].server_version' build_versions.yaml )" | cut -d- -f1 >> $GITHUB_OUTPUT
30-
31-
- id: db_version
32-
run: echo "db_version=$(yq '.include[1].db_version' build_versions.yaml)" | cut -d- -f1 >> $GITHUB_OUTPUT
33-
3426
build-X86-container:
3527
runs-on: ubuntu-24.04
3628
permissions:
@@ -40,6 +32,12 @@ jobs:
4032
strategy:
4133
matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
4234
steps:
35+
- id: server_version
36+
run: echo "server_version=${{ matrix.server_version }}" | cut -d- -f1 >> $GITHUB_OUTPUT
37+
38+
- id: db_version
39+
run: echo "db_version=${{ matrix.db_version }}" | cut -d- -f1 >> $GITHUB_OUTPUT
40+
4341
- name: Build OpenVox Server ${{ matrix.release }} container
4442
uses: voxpupuli/gha-build-and-publish-a-container@v2
4543
with:
@@ -63,8 +61,8 @@ jobs:
6361
registry_password: ${{ secrets.GITHUB_TOKEN }}
6462
build_args: |
6563
OPENVOX_RELEASE=${{ matrix.release }}
66-
OPENVOXSERVER_VERSION=${{ needs.setup-matrix.outputs.server_version }}
67-
OPENVOXDB_VERSION=${{ needs.setup-matrix.outputs.db_version }}
64+
OPENVOXSERVER_VERSION=${{ steps.server_version.outputs.server_version }}
65+
OPENVOXDB_VERSION=${{ steps.db_version.outputs.db_version }}
6866
R10K_VERSION=${{ matrix.r10k_version }}
6967
build_arch: linux/amd64
7068
build_context: openvoxserver
@@ -81,6 +79,12 @@ jobs:
8179
strategy:
8280
matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
8381
steps:
82+
- id: server_version
83+
run: echo "server_version=${{ matrix.server_version }}" | cut -d- -f1 >> $GITHUB_OUTPUT
84+
85+
- id: db_version
86+
run: echo "db_version=${{ matrix.db_version }}" | cut -d- -f1 >> $GITHUB_OUTPUT
87+
8488
- name: Build OpenVox Server ${{ matrix.release }} container
8589
uses: voxpupuli/gha-build-and-publish-a-container@v2
8690
with:
@@ -104,8 +108,8 @@ jobs:
104108
registry_password: ${{ secrets.GITHUB_TOKEN }}
105109
build_args: |
106110
OPENVOX_RELEASE=${{ matrix.release }}
107-
OPENVOXSERVER_VERSION=${{ needs.setup-matrix.outputs.server_version }}
108-
OPENVOXDB_VERSION=${{ needs.setup-matrix.outputs.db_version }}
111+
OPENVOXSERVER_VERSION=${{ steps.server_version.outputs.server_version }}
112+
OPENVOXDB_VERSION=${{ steps.db_version.outputs.db_version }}
109113
R10K_VERSION=${{ matrix.r10k_version }}
110114
build_arch: linux/arm64
111115
build_context: openvoxserver
@@ -139,17 +143,15 @@ jobs:
139143
username: voxpupulibot
140144
password: ${{ secrets.DOCKERHUB_BOT_ADMIN_TOKEN }}
141145

142-
- name: Create multi arch manifests
143-
run: |
144-
docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:${{ needs.setup-matrix.outputs.server_version }}-${{ github.ref_name }} \
145-
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64 \
146-
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64
146+
- id: server_version
147+
run: echo "server_version=${{ matrix.server_version }}" | cut -d- -f1 >> $GITHUB_OUTPUT
147148

148-
docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:${{ needs.setup-matrix.outputs.server_version }}-latest \
149-
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64 \
150-
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64
149+
- id: db_version
150+
run: echo "db_version=${{ matrix.db_version }}" | cut -d- -f1 >> $GITHUB_OUTPUT
151151

152-
docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-latest \
152+
- name: Create multi arch manifests
153+
run: |
154+
docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:${{ steps.server_version.outputs.server_version }}-${{ github.ref_name }} \
153155
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64 \
154156
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64
155157
@@ -163,15 +165,7 @@ jobs:
163165
164166
# on docker.io we use the voxpupuli namespace because new organizations are not free anymore
165167
#
166-
docker buildx imagetools create -t docker.io/voxpupuli/openvoxserver:${{ needs.setup-matrix.outputs.server_version }}-${{ github.ref_name }} \
167-
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64 \
168-
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64
169-
170-
docker buildx imagetools create -t docker.io/voxpupuli/openvoxserver:${{ needs.setup-matrix.outputs.server_version }}-latest \
171-
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64 \
172-
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64
173-
174-
docker buildx imagetools create -t docker.io/voxpupuli/openvoxserver:${{ matrix.release }}-latest \
168+
docker buildx imagetools create -t docker.io/voxpupuli/openvoxserver:${{ steps.server_version.outputs.server_version }}-${{ github.ref_name }} \
175169
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64 \
176170
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64
177171
@@ -186,15 +180,7 @@ jobs:
186180
- name: Create Alpine multi arch manifests
187181
if: ${{ matrix.release == '8' }}
188182
run: |
189-
docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:${{ needs.setup-matrix.outputs.server_version }}-${{ github.ref_name }}-alpine-beta \
190-
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64-alpine \
191-
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64-alpine
192-
193-
docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:${{ needs.setup-matrix.outputs.server_version }}-latest-alpine-beta \
194-
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64-alpine \
195-
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64-alpine
196-
197-
docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-latest-alpine-beta \
183+
docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:${{ steps.server_version.outputs.server_version }}-${{ github.ref_name }}-alpine-beta \
198184
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64-alpine \
199185
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64-alpine
200186
@@ -207,16 +193,7 @@ jobs:
207193
ghcr.io/openvoxproject/openvoxserver:8-${{ github.sha }}-x86_64-alpine
208194
209195
# on docker.io we use the voxpupuli namespace because new organizations are not free anymore
210-
#
211-
docker buildx imagetools create -t docker.io/voxpupuli/openvoxserver:${{ needs.setup-matrix.outputs.server_version }}-${{ github.ref_name }}-alpine-beta \
212-
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64-alpine \
213-
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64-alpine
214-
215-
docker buildx imagetools create -t docker.io/voxpupuli/openvoxserver:${{ needs.setup-matrix.outputs.server_version }}-latest-alpine-beta \
216-
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64-alpine \
217-
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64-alpine
218-
219-
docker buildx imagetools create -t docker.io/voxpupuli/openvoxserver:${{ matrix.release }}-latest-alpine-beta \
196+
docker buildx imagetools create -t docker.io/voxpupuli/openvoxserver:${{ steps.server_version.outputs.server_version }}-${{ github.ref_name }}-alpine-beta \
220197
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64-alpine \
221198
ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64-alpine
222199

0 commit comments

Comments
 (0)