Skip to content

Commit 6c84b42

Browse files
author
Javad Malaquti
committed
feat: w.i.p segregate docker repos per distribution
1 parent a1b582e commit 6c84b42

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.github/workflows/build-test-and-publish.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ jobs:
3333
env:
3434
DISTRO: ${{ matrix.DISTRO }}
3535
PLATFORM: ${{ matrix.PLATFORM }}
36-
IMAGE_REGISTRY_OPERATON: ${{ vars.IMAGE_REGISTRY_OPERATON }}
37-
IMAGE_REGISTRY_TOMCAT: ${{ vars.IMAGE_REGISTRY_TOMCAT }}
36+
IMAGE_REPO_OPERATON: ${{ vars.IMAGE_REPO_OPERATON }}
37+
IMAGE_REPO_TOMCAT: ${{ vars.IMAGE_REPO_TOMCAT }}
3838
- name: Test
3939
run: ./test.sh
4040
working-directory: test
4141
env:
4242
DISTRO: ${{ matrix.DISTRO }}
4343
PLATFORM: ${{ matrix.PLATFORM }}
44-
IMAGE_REGISTRY_OPERATON: ${{ vars.IMAGE_REGISTRY_OPERATON }}
45-
IMAGE_REGISTRY_TOMCAT: ${{ vars.IMAGE_REGISTRY_TOMCAT }}
44+
IMAGE_REPO_OPERATON: ${{ vars.IMAGE_REPO_OPERATON }}
45+
IMAGE_REPO_TOMCAT: ${{ vars.IMAGE_REPO_TOMCAT }}
4646
publish:
4747
runs-on: ubuntu-20.04
4848
needs: build-and-test
@@ -75,5 +75,5 @@ jobs:
7575
PLATFORMS: linux/arm64,linux/amd64
7676
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
7777
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
78-
IMAGE_REGISTRY_OPERATON: ${{ vars.IMAGE_REGISTRY_OPERATON }}
79-
IMAGE_REGISTRY_TOMCAT: ${{ vars.IMAGE_REGISTRY_TOMCAT }}
78+
IMAGE_REPO_OPERATON: ${{ vars.IMAGE_REPO_OPERATON }}
79+
IMAGE_REPO_TOMCAT: ${{ vars.IMAGE_REPO_TOMCAT }}

pipeline.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ else
1313
fi
1414

1515
if [ "$DISTRO" == "run" ]; then
16-
IMAGE_NAME=${IMAGE_REGISTRY_OPERATON}:${PLATFORM}
16+
IMAGE_NAME=${IMAGE_REPO_OPERATON}:${PLATFORM}
1717
elif [ "$DISTRO" == "tomcat" ]; then
18-
IMAGE_NAME=${IMAGE_REGISTRY_TOMCAT}:${PLATFORM}
18+
IMAGE_NAME=${IMAGE_REPO_TOMCAT}:${PLATFORM}
1919
fi
2020

2121
docker buildx build . \

release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ SNAPSHOT=${SNAPSHOT:-$(grep SNAPSHOT= Dockerfile | cut -d = -f 2)}
66
PLATFORMS=${PLATFORMS:-linux/amd64}
77

88
if [ "$DISTRO" == "run" ]; then
9-
IMAGE=${IMAGE_REGISTRY_OPERATON}
9+
IMAGE=${IMAGE_REPO_OPERATON}
1010
elif [ "$DISTRO" == "tomcat" ]; then
11-
IMAGE=${IMAGE_REGISTRY_TOMCAT}
11+
IMAGE=${IMAGE_REPO_TOMCAT}
1212
fi
1313

1414
function build_and_push {

test/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash -xeu
22

33
if [ "$DISTRO" == "run" ]; then
4-
IMAGE_NAME=${IMAGE_REGISTRY_OPERATON}:${PLATFORM}
4+
IMAGE_NAME=${IMAGE_REPO_OPERATON}:${PLATFORM}
55
elif [ "$DISTRO" == "tomcat" ]; then
6-
IMAGE_NAME=${IMAGE_REGISTRY_TOMCAT}:${PLATFORM}
6+
IMAGE_NAME=${IMAGE_REPO_TOMCAT}:${PLATFORM}
77
fi
88

99
export IMAGE_NAME

0 commit comments

Comments
 (0)