Skip to content

Commit 5ece046

Browse files
author
qarlosalberto
committed
ci: fix github push images
1 parent 234c7fe commit 5ece046

File tree

1 file changed

+23
-13
lines changed

1 file changed

+23
-13
lines changed

.github/workflows/docker.yml

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ jobs:
1414
matrix:
1515
include:
1616
# --> metrics server
17-
- NAME: metrics-server/metrics_server
17+
- TAGNAME: ""
18+
REPOSITORY: metrics-server
1819
EXTRA_CMAKE_ARGS: ""
1920
ARCH: ""
2021
PLATFORM: amd64
@@ -23,7 +24,8 @@ jobs:
2324
DOCKERFILE: ./docker/grafana/Dockerfile
2425
CONTEXT: ./docker/grafana
2526
# --> grafana
26-
- NAME: grafana/grafana
27+
- TAGNAME: ""
28+
REPOSITORY: grafana
2729
EXTRA_CMAKE_ARGS: ""
2830
ARCH: ""
2931
PLATFORM: amd64
@@ -33,15 +35,17 @@ jobs:
3335
CONTEXT: ./docker/metrics_server
3436
# --> split72
3537
# AMD AVX2
36-
- NAME: srsran-project/split72_release_avx2
38+
- TAGNAME: split72_release_avx2
39+
REPOSITORY: srsran-project
3740
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off
3841
ARCH: x86-64-v3
3942
PLATFORM: amd64
4043
LIB: dpdk
4144
LIB_VERSION: "23.11"
4245
DOCKERFILE: ./docker/Dockerfile
4346
CONTEXT: ./
44-
- NAME: srsran-project/split72_release_with_debug_avx2
47+
- TAGNAME: split72_release_with_debug_avx2
48+
REPOSITORY: srsran-project
4549
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off -DFORCE_DEBUG_INFO=On
4650
ARCH: x86-64-v3
4751
PLATFORM: amd64
@@ -50,15 +54,17 @@ jobs:
5054
DOCKERFILE: ./docker/Dockerfile
5155
CONTEXT: ./
5256
# AMD AVX512
53-
- NAME: srsran-project/split72_release_avx512
57+
- TAGNAME: split72_release_avx512
58+
REPOSITORY: srsran-project
5459
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off
5560
ARCH: x86-64-v4
5661
PLATFORM: amd64
5762
LIB: dpdk
5863
LIB_VERSION: "23.11"
5964
DOCKERFILE: ./docker/Dockerfile
6065
CONTEXT: ./
61-
- NAME: srsran-project/split72_release_with_debug_avx512
66+
- TAGNAME: split72_release_with_debug_avx512
67+
REPOSITORY: srsran-project
6268
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off -DFORCE_DEBUG_INFO=On
6369
ARCH: x86-64-v4
6470
PLATFORM: amd64
@@ -68,15 +74,17 @@ jobs:
6874
CONTEXT: ./
6975
# --> split8
7076
# AMD AVX2
71-
- NAME: srsran-project/split8_release_avx2
77+
- TAGNAME: split8_release_avx2
78+
REPOSITORY: srsran-project
7279
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off
7380
ARCH: x86-64-v3
7481
PLATFORM: amd64
7582
LIB: uhd
7683
LIB_VERSION: "4.6.0.0"
7784
DOCKERFILE: ./docker/Dockerfile
7885
CONTEXT: ./
79-
- NAME: srsran-project/split8_release_with_debug_avx2
86+
- TAGNAME: split8_release_with_debug_avx2
87+
REPOSITORY: srsran-project
8088
EXTRA_CMAKE_ARGS: -DAUTO_DETECT_ISA=Off -DFORCE_DEBUG_INFO=On
8189
ARCH: x86-64-v3
8290
PLATFORM: amd64
@@ -85,7 +93,7 @@ jobs:
8593
DOCKERFILE: ./docker/Dockerfile
8694
CONTEXT: ./
8795
env:
88-
NAME: softwareradiosystems/${{ matrix.NAME }}
96+
PREFIX: softwareradiosystems/${{ matrix.REPOSITORY }}:${{ matrix.TAGNAME }}
8997
environment: dockerhub
9098
steps:
9199
- name: Checkout code
@@ -101,18 +109,20 @@ jobs:
101109
id: tags
102110
run: |
103111
BRANCH_NAME="${GITHUB_REF#refs/heads/}"
104-
DATE_TAG="${GITHUB_SHA:0:10}-$(date +'%Y-%m-%d')"
112+
DATE_TAG="${GITHUB_SHA:0:10}__$(date +'%Y-%m-%d')"
105113
RELEASE_NAME="${{ github.event.release.name }}"
106114
107115
if [ -n "$RELEASE_NAME" ]; then
108-
tags="${{ env.NAME }}:${DATE_TAG},${{ env.NAME }}:${RELEASE_NAME}"
116+
tags="${{ env.PREFIX }}-${DATE_TAG},${{ env.PREFIX }}-${RELEASE_NAME}"
109117
else
110118
if [ "$BRANCH_NAME" == "main" ]; then
111-
tags="${{ env.NAME }}:${DATE_TAG},${{ env.NAME }}:latest"
119+
tags="${{ env.PREFIX }}-${DATE_TAG},${{ env.PREFIX }}-latest"
112120
elif [ "$BRANCH_NAME" == "test" ]; then
113-
tags="${{ env.NAME }}:${DATE_TAG},${{ env.NAME }}:next"
121+
tags="${{ env.PREFIX }}-${DATE_TAG},${{ env.PREFIX }}-next"
114122
fi
115123
fi
124+
tags="${tags//:-/:}"
125+
echo "tags=$tags"
116126
echo "tags=$tags" >> $GITHUB_OUTPUT
117127
118128
- name: Login to Docker Hub

0 commit comments

Comments
 (0)