Skip to content

Commit 0e0d5de

Browse files
committed
env: workflow env
1 parent 3e48f97 commit 0e0d5de

File tree

1 file changed

+8
-41
lines changed

1 file changed

+8
-41
lines changed

.github/workflows/build.yaml

Lines changed: 8 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ on:
55
branches:
66
- main
77

8+
env:
9+
REGISTRY: ${{ secrets.REHOSTING_ARC_REGISTRY || vars.EXTERNAL_REGISTRY }}
10+
USER: ${{ secrets.REHOSTING_ARC_REGISTRY_USER || vars.EXTERNAL_REGISTRY_USERNAME }}
11+
CACHE: ${{ secrets.REHOSTING_ARC_REGISTRY && format('{0}/proxy', secrets.REHOSTING_ARC_REGISTRY) || 'docker.io' }}
12+
TARGET: ${{ secrets.REHOSTING_ARC_REGISTRY || format('{0}/external', vars.EXTERNAL_REGISTRY) }}
13+
814
jobs:
915
lint:
1016
runs-on: rehosting-arc
@@ -47,25 +53,6 @@ jobs:
4753
uses: actions/checkout@v4
4854
with:
4955
fetch-depth: 0
50-
- name: Set registry variables
51-
id: extern
52-
run: |
53-
if [ -z "${{ secrets.REHOSTING_ARC_REGISTRY }}" ]; then
54-
echo "Using external registry"
55-
echo "REGISTRY=${{ vars.EXTERNAL_REGISTRY }}" >> $GITHUB_ENV
56-
echo "USER=${{ vars.EXTERNAL_REGISTRY_USERNAME }}" >> $GITHUB_ENV
57-
echo "PASS=${{ vars.EXTERNAL_REGISTRY_PASSWORD }}" >> $GITHUB_ENV
58-
echo "CACHE=docker.io" >> $GITHUB_ENV
59-
echo "TARGET=${{ vars.EXTERNAL_REGISTRY }}/external" >> $GITHUB_ENV
60-
else
61-
echo "Using internal registry"
62-
echo "REGISTRY=${{ secrets.REHOSTING_ARC_REGISTRY }}" >> $GITHUB_ENV
63-
echo "USER=${{ secrets.REHOSTING_ARC_REGISTRY_USER }}" >> $GITHUB_ENV
64-
echo "PASS=${{ secrets.REHOSTING_ARC_REGISTRY_PASSWORD }}" >> $GITHUB_ENV
65-
echo "CACHE=${{ secrets.REHOSTING_ARC_REGISTRY }}/proxy" >> $GITHUB_ENV
66-
echo "TARGET=${{ secrets.REHOSTING_ARC_REGISTRY }}" >> $GITHUB_ENV
67-
fi
68-
6956
- name: Trust Harbor's self-signed certificate
7057
run: |
7158
echo "Fetching certificate from ${{ env.REGISTRY }}"
@@ -88,7 +75,7 @@ jobs:
8875
with:
8976
registry: ${{ env.REGISTRY }}
9077
username: ${{ env.USER }}
91-
password: ${{ env.PASS }}
78+
password: ${{ secrets.REHOSTING_ARC_REGISTRY_PASSWORD || vars.EXTERNAL_REGISTRY_PASSWORD }}
9279

9380
- name: Build Docker image and push to Docker Hub
9481
uses: docker/build-push-action@v6
@@ -129,25 +116,6 @@ jobs:
129116
with:
130117
fetch-depth: 0
131118
ref: ${{ github.event.pull_request.head.sha || github.ref }}
132-
- name: Set registry variables
133-
id: extern
134-
run: |
135-
if [ -z "${{ secrets.REHOSTING_ARC_REGISTRY }}" ]; then
136-
echo "Using external registry"
137-
echo "REGISTRY=${{ vars.EXTERNAL_REGISTRY }}" >> $GITHUB_ENV
138-
echo "USER=${{ vars.EXTERNAL_REGISTRY_USERNAME }}" >> $GITHUB_ENV
139-
echo "PASS=${{ vars.EXTERNAL_REGISTRY_PASSWORD }}" >> $GITHUB_ENV
140-
echo "CACHE=docker.io" >> $GITHUB_ENV
141-
echo "TARGET=${{ vars.EXTERNAL_REGISTRY }}/external" >> $GITHUB_ENV
142-
else
143-
echo "Using internal registry"
144-
echo "REGISTRY=${{ secrets.REHOSTING_ARC_REGISTRY }}" >> $GITHUB_ENV
145-
echo "USER=${{ secrets.REHOSTING_ARC_REGISTRY_USER }}" >> $GITHUB_ENV
146-
echo "PASS=${{ secrets.REHOSTING_ARC_REGISTRY_PASSWORD }}" >> $GITHUB_ENV
147-
echo "CACHE=${{ secrets.REHOSTING_ARC_REGISTRY }}/proxy" >> $GITHUB_ENV
148-
echo "TARGET=${{ secrets.REHOSTING_ARC_REGISTRY }}" >> $GITHUB_ENV
149-
fi
150-
151119
- name: Trust Harbor's self-signed certificate
152120
run: |
153121
echo "Fetching certificate from ${{ env.REGISTRY }}"
@@ -159,8 +127,7 @@ jobs:
159127
with:
160128
registry: ${{ env.REGISTRY }}
161129
username: ${{ env.USER }}
162-
password: ${{ env.PASS }}
163-
130+
password: ${{ secrets.REHOSTING_ARC_REGISTRY_PASSWORD || vars.EXTERNAL_REGISTRY_PASSWORD }}
164131

165132
# Locally tag as latest, just for testing
166133
- name: Pull the image from Rehosting Arc Registry

0 commit comments

Comments
 (0)