Skip to content

Commit

Permalink
fix yaml syntax
Browse files Browse the repository at this point in the history
Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
  • Loading branch information
frouioui committed Oct 18, 2023
1 parent 024b981 commit 614ad73
Showing 1 changed file with 8 additions and 24 deletions.
32 changes: 8 additions & 24 deletions .github/workflows/docker_build_base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,7 @@ jobs:
context: ${{ env.DOCKER_CTX }}
push: true
tags: frouioui/k8s:latest
build-args:
- VT_BASE_VER=latest
- DEBIAN_VER=${{ matrix.debian }}-slim
build-args: VT_BASE_VER=latest,DEBIAN_VER=${{ matrix.debian }}-slim

- name: Build and push on main debian specific tag
if: github.ref == 'refs/heads/main'
Expand All @@ -117,9 +115,7 @@ jobs:
context: ${{ env.DOCKER_CTX }}
push: true
tags: frouioui/k8s:latest-${{ matrix.debian }}
build-args:
- VT_BASE_VER=latest
- DEBIAN_VER=${{ matrix.debian }}-slim
build-args: VT_BASE_VER=latest,DEBIAN_VER=${{ matrix.debian }}-slim

######
# All code below only applies to new tags
Expand Down Expand Up @@ -149,9 +145,7 @@ jobs:
context: ${{ env.DOCKER_CTX }}
push: true
tags: ${{ env.DOCKER_TAG }}
build-args:
- VT_BASE_VER=${TAG_NAME}
- DEBIAN_VER=${{ matrix.debian }}-slim
build-args: VT_BASE_VER=${TAG_NAME},DEBIAN_VER=${{ matrix.debian }}-slim

# Build and Push component image to DOCKER_TAG_DEFAULT_DEBIAN, only applies when building the default Debian version (bookworm)
# It is fine to build a second time here when "matrix.debian == 'bookworm'" as we have cached the first build already
Expand All @@ -162,9 +156,7 @@ jobs:
context: ${{ env.DOCKER_CTX }}
push: true
tags: ${{ env.DOCKER_TAG_DEFAULT_DEBIAN }}
build-args:
- VT_BASE_VER=${TAG_NAME}
- DEBIAN_VER=${{ matrix.debian }}-slim
build-args: VT_BASE_VER=${TAG_NAME},DEBIAN_VER=${{ matrix.debian }}-slim


build_and_push_components:
Expand Down Expand Up @@ -200,9 +192,7 @@ jobs:
context: ${{ env.DOCKER_CTX }}
push: true
tags: frouioui/${{ matrix.component }}:latest
build-args:
- VT_BASE_VER=latest
- DEBIAN_VER=${{ matrix.debian }}-slim
build-args: VT_BASE_VER=latest,DEBIAN_VER=${{ matrix.debian }}-slim

- name: Build and push on main debian specific tag
if: github.ref == 'refs/heads/main'
Expand All @@ -211,9 +201,7 @@ jobs:
context: ${{ env.DOCKER_CTX }}
push: true
tags: frouioui/${{ matrix.component }}:latest-${{ matrix.debian }}
build-args:
- VT_BASE_VER=latest
- DEBIAN_VER=${{ matrix.debian }}-slim
build-args: VT_BASE_VER=latest,DEBIAN_VER=${{ matrix.debian }}-slim

######
# All code below only applies to new tags
Expand Down Expand Up @@ -243,9 +231,7 @@ jobs:
context: ${{ env.DOCKER_CTX }}
push: true
tags: ${{ env.DOCKER_TAG }}
build-args:
- VT_BASE_VER=${TAG_NAME}
- DEBIAN_VER=${{ matrix.debian }}-slim
build-args: VT_BASE_VER=${TAG_NAME},DEBIAN_VER=${{ matrix.debian }}-slim

# Build and Push component image to DOCKER_TAG_DEFAULT_DEBIAN, only applies when building the default Debian version (bookworm)
# It is fine to build a second time here when "matrix.debian == 'bookworm'" as we have cached the first build already
Expand All @@ -256,6 +242,4 @@ jobs:
context: ${{ env.DOCKER_CTX }}
push: true
tags: ${{ env.DOCKER_TAG_DEFAULT_DEBIAN }}
build-args:
- VT_BASE_VER=${TAG_NAME}
- DEBIAN_VER=${{ matrix.debian }}-slim
build-args: VT_BASE_VER=${TAG_NAME},DEBIAN_VER=${{ matrix.debian }}-slim

0 comments on commit 614ad73

Please sign in to comment.