Skip to content

Commit a009906

Browse files
committed
Add unified image location.
1 parent 2de4c5e commit a009906

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

.github/workflows/docker_auto.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
env:
1414
DOCKER_PLATFORMS: linux/amd64,linux/arm/v7,linux/arm64
1515
DOCKER_IMAGE: haproxytech/haproxy-debian
16+
DOCKER_IMAGE_UNIFIED: haproxytech/haproxy
1617
STABLE_BRANCH: "3.3"
1718
steps:
1819
- name: Login to Docker Hub
@@ -80,6 +81,9 @@ jobs:
8081
${{ env.DOCKER_IMAGE }}:latest
8182
${{ env.DOCKER_IMAGE }}:${{ env.BUILD_BRANCH }}
8283
${{ env.DOCKER_IMAGE }}:${{ env.BUILD_VER }}
84+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-latest
85+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-${{ env.BUILD_BRANCH }}
86+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-${{ env.BUILD_VER }}
8387
ghcr.io/${{ github.repository }}:latest
8488
ghcr.io/${{ github.repository }}:${{ env.BUILD_BRANCH }}
8589
ghcr.io/${{ github.repository }}:${{ env.BUILD_VER }}
@@ -114,6 +118,9 @@ jobs:
114118
${{ env.DOCKER_IMAGE }}:s6-latest
115119
${{ env.DOCKER_IMAGE }}:s6-${{ env.BUILD_BRANCH }}
116120
${{ env.DOCKER_IMAGE }}:s6-${{ env.BUILD_VER }}
121+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-s6-latest
122+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-s6-${{ env.BUILD_BRANCH }}
123+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-s6-${{ env.BUILD_VER }}
117124
ghcr.io/${{ github.repository }}:s6-latest
118125
ghcr.io/${{ github.repository }}:s6-${{ env.BUILD_BRANCH }}
119126
ghcr.io/${{ github.repository }}:s6-${{ env.BUILD_VER }}
@@ -147,6 +154,8 @@ jobs:
147154
tags: |
148155
${{ env.DOCKER_IMAGE }}:${{ env.BUILD_BRANCH }}
149156
${{ env.DOCKER_IMAGE }}:${{ env.BUILD_VER }}
157+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-${{ env.BUILD_BRANCH }}
158+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-${{ env.BUILD_VER }}
150159
ghcr.io/${{ github.repository }}:${{ env.BUILD_BRANCH }}
151160
ghcr.io/${{ github.repository }}:${{ env.BUILD_VER }}
152161
cache-from: type=local,src=/tmp/.buildx-cache
@@ -179,6 +188,8 @@ jobs:
179188
tags: |
180189
${{ env.DOCKER_IMAGE }}:s6-${{ env.BUILD_BRANCH }}
181190
${{ env.DOCKER_IMAGE }}:s6-${{ env.BUILD_VER }}
191+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-s6-${{ env.BUILD_BRANCH }}
192+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-s6-${{ env.BUILD_VER }}
182193
ghcr.io/${{ github.repository }}:s6-${{ env.BUILD_BRANCH }}
183194
ghcr.io/${{ github.repository }}:s6-${{ env.BUILD_VER }}
184195
cache-from: type=local,src=/tmp/.buildx-cache

.github/workflows/docker_manual.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
env:
1414
DOCKER_PLATFORMS: linux/amd64,linux/arm/v7,linux/arm64
1515
DOCKER_IMAGE: haproxytech/haproxy-debian
16+
DOCKER_IMAGE_UNIFIED: haproxytech/haproxy
1617
STABLE_BRANCH: "3.3"
1718
steps:
1819
- name: Login to Docker Hub
@@ -80,6 +81,9 @@ jobs:
8081
${{ env.DOCKER_IMAGE }}:latest
8182
${{ env.DOCKER_IMAGE }}:${{ env.BUILD_BRANCH }}
8283
${{ env.DOCKER_IMAGE }}:${{ env.BUILD_VER }}
84+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-latest
85+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-${{ env.BUILD_BRANCH }}
86+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-${{ env.BUILD_VER }}
8387
ghcr.io/${{ github.repository }}:latest
8488
ghcr.io/${{ github.repository }}:${{ env.BUILD_BRANCH }}
8589
ghcr.io/${{ github.repository }}:${{ env.BUILD_VER }}
@@ -114,6 +118,9 @@ jobs:
114118
${{ env.DOCKER_IMAGE }}:s6-latest
115119
${{ env.DOCKER_IMAGE }}:s6-${{ env.BUILD_BRANCH }}
116120
${{ env.DOCKER_IMAGE }}:s6-${{ env.BUILD_VER }}
121+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-s6-latest
122+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-s6-${{ env.BUILD_BRANCH }}
123+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-s6-${{ env.BUILD_VER }}
117124
ghcr.io/${{ github.repository }}:s6-latest
118125
ghcr.io/${{ github.repository }}:s6-${{ env.BUILD_BRANCH }}
119126
ghcr.io/${{ github.repository }}:s6-${{ env.BUILD_VER }}
@@ -147,6 +154,8 @@ jobs:
147154
tags: |
148155
${{ env.DOCKER_IMAGE }}:${{ env.BUILD_BRANCH }}
149156
${{ env.DOCKER_IMAGE }}:${{ env.BUILD_VER }}
157+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-${{ env.BUILD_BRANCH }}
158+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-${{ env.BUILD_VER }}
150159
ghcr.io/${{ github.repository }}:${{ env.BUILD_BRANCH }}
151160
ghcr.io/${{ github.repository }}:${{ env.BUILD_VER }}
152161
cache-from: type=local,src=/tmp/.buildx-cache
@@ -179,6 +188,8 @@ jobs:
179188
tags: |
180189
${{ env.DOCKER_IMAGE }}:s6-${{ env.BUILD_BRANCH }}
181190
${{ env.DOCKER_IMAGE }}:s6-${{ env.BUILD_VER }}
191+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-s6-${{ env.BUILD_BRANCH }}
192+
${{ env.DOCKER_IMAGE_UNIFIED }}:debian-s6-${{ env.BUILD_VER }}
182193
ghcr.io/${{ github.repository }}:s6-${{ env.BUILD_BRANCH }}
183194
ghcr.io/${{ github.repository }}:s6-${{ env.BUILD_VER }}
184195
cache-from: type=local,src=/tmp/.buildx-cache

0 commit comments

Comments
 (0)