Skip to content

Commit 5471ac9

Browse files
chrissearlechrissearle
committed
Secrets can't be used in expression - move to env to test
1 parent 7395949 commit 5471ac9

3 files changed

Lines changed: 45 additions & 33 deletions

File tree

‎.github/workflows/backend.yaml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ jobs:
1111
name: "Build Cupcake backend"
1212
runs-on: ubuntu-latest
1313

14+
env:
15+
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
16+
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
17+
1418
steps:
1519
- name: Checkout
1620
uses: actions/checkout@v4
@@ -30,31 +34,31 @@ jobs:
3034

3135
- name: Set up QEMU
3236
uses: docker/setup-qemu-action@v3
33-
if: ${{ secrets.DOCKERHUB_USERNAME != '' }}
37+
if: ${{ env.DOCKERHUB_USERNAME != '' }}
3438

3539
- name: Set up Docker Buildx
3640
uses: docker/setup-buildx-action@v3
37-
if: ${{ secrets.DOCKERHUB_USERNAME != '' }}
41+
if: ${{ env.DOCKERHUB_USERNAME != '' }}
3842

3943
- name: Login to DockerHub Registry
4044
uses: docker/login-action@v3
4145
with:
42-
username: ${{ secrets.DOCKERHUB_USERNAME }}
43-
password: ${{ secrets.DOCKERHUB_TOKEN }}
44-
if: ${{ secrets.DOCKERHUB_USERNAME != '' }}
46+
username: ${{ env.DOCKERHUB_USERNAME }}
47+
password: ${{ env.DOCKERHUB_TOKEN }}
48+
if: ${{ env.DOCKERHUB_USERNAME != '' }}
4549

4650
- name: Build and push
4751
uses: docker/build-push-action@v5
4852
with:
4953
context: ./backend
5054
platforms: linux/amd64,linux/arm64
5155
push: true
52-
tags: "${{ secrets.DOCKERHUB_USERNAME }}/cupcake:${{ github.sha }},${{ secrets.DOCKERHUB_USERNAME }}/cupcake:latest"
53-
if: ${{ secrets.DOCKERHUB_USERNAME != '' }}
56+
tags: "${{ env.DOCKERHUB_USERNAME }}/cupcake:${{ github.sha }},${{ env.DOCKERHUB_USERNAME }}/cupcake:latest"
57+
if: ${{ env.DOCKERHUB_USERNAME != '' }}
5458

5559
- name: Create staging
56-
if: ${{ github.ref == 'refs/heads/main' && secrets.DOCKERHUB_USERNAME != '' }}
57-
run: docker buildx imagetools create -t ${{ secrets.DOCKERHUB_USERNAME }}/cupcake:staging ${{ secrets.DOCKERHUB_USERNAME }}/cupcake:latest
60+
if: ${{ github.ref == 'refs/heads/main' && env.DOCKERHUB_USERNAME != '' }}
61+
run: docker buildx imagetools create -t ${{ env.DOCKERHUB_USERNAME }}/cupcake:staging ${{ env.DOCKERHUB_USERNAME }}/cupcake:latest
5862

5963
- name: Upload reports if failed
6064
if: failure()

‎.github/workflows/frontend.yaml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,41 @@ jobs:
1111
name: "Build search frontend"
1212
runs-on: ubuntu-latest
1313

14+
env:
15+
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
16+
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
17+
1418
steps:
1519
- name: Checkout
1620
uses: actions/checkout@v4
1721

1822
- name: Set up QEMU
1923
uses: docker/setup-qemu-action@v3
20-
if: ${{ secrets.DOCKERHUB_USERNAME != '' }}
24+
if: ${{ env.DOCKERHUB_USERNAME != '' }}
2125

2226
- name: Set up Docker Buildx
2327
uses: docker/setup-buildx-action@v3
24-
if: ${{ secrets.DOCKERHUB_USERNAME != '' }}
28+
if: ${{ env.DOCKERHUB_USERNAME != '' }}
2529

2630
- name: Login to DockerHub Registry
2731
uses: docker/login-action@v3
2832
with:
29-
username: ${{ secrets.DOCKERHUB_USERNAME }}
30-
password: ${{ secrets.DOCKERHUB_TOKEN }}
31-
if: ${{ secrets.DOCKERHUB_USERNAME != '' }}
33+
username: ${{ env.DOCKERHUB_USERNAME }}
34+
password: ${{ env.DOCKERHUB_TOKEN }}
35+
if: ${{ env.DOCKERHUB_USERNAME != '' }}
3236

3337
- name: Build and push
3438
uses: docker/build-push-action@v5
3539
with:
3640
context: ./frontend
3741
platforms: linux/amd64,linux/arm64
3842
push: true
39-
tags: "${{ secrets.DOCKERHUB_USERNAME }}/frosting:${{ github.sha }},${{ secrets.DOCKERHUB_USERNAME }}/frosting:latest"
40-
if: ${{ secrets.DOCKERHUB_USERNAME != '' }}
43+
tags: "${{ env.DOCKERHUB_USERNAME }}/frosting:${{ github.sha }},${{ env.DOCKERHUB_USERNAME }}/frosting:latest"
44+
if: ${{ env.DOCKERHUB_USERNAME != '' }}
4145

4246
- name: Create staging
43-
if: ${{ github.ref == 'refs/heads/main' && secrets.DOCKERHUB_USERNAME != '' }}
44-
run: docker buildx imagetools create -t ${{ secrets.DOCKERHUB_USERNAME }}/frosting:staging ${{ secrets.DOCKERHUB_USERNAME }}/frosting:latest
47+
if: ${{ github.ref == 'refs/heads/main' && env.DOCKERHUB_USERNAME != '' }}
48+
run: docker buildx imagetools create -t ${{ env.DOCKERHUB_USERNAME }}/frosting:staging ${{ env.DOCKERHUB_USERNAME }}/frosting:latest
4549

4650
- name: Generate summary
4751
run: |

‎.github/workflows/release.yaml‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,38 @@ jobs:
1010
name: "Build Cupcake backend - release"
1111
runs-on: ubuntu-latest
1212

13+
env:
14+
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
15+
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
16+
1317
steps:
1418
- name: Login to DockerHub Registry
1519
uses: docker/login-action@v3
1620
with:
17-
username: ${{ secrets.DOCKERHUB_USERNAME }}
18-
password: ${{ secrets.DOCKERHUB_TOKEN }}
19-
if: ${{ secrets.DOCKERHUB_USERNAME != '' }}
21+
username: ${{ env.DOCKERHUB_USERNAME }}
22+
password: ${{ env.DOCKERHUB_TOKEN }}
23+
if: ${{ env.DOCKERHUB_USERNAME != '' }}
2024

2125
- name: Get current backend
22-
run: docker pull ${{ secrets.DOCKERHUB_USERNAME }}/cupcake:staging
23-
if: ${{ secrets.DOCKERHUB_USERNAME != '' }}
26+
run: docker pull ${{ env.DOCKERHUB_USERNAME }}/cupcake:staging
27+
if: ${{ env.DOCKERHUB_USERNAME != '' }}
2428

2529
- name: Get current frontend
26-
run: docker pull ${{ secrets.DOCKERHUB_USERNAME }}/frosting:staging
27-
if: ${{ secrets.DOCKERHUB_USERNAME != '' }}
30+
run: docker pull ${{ env.DOCKERHUB_USERNAME }}/frosting:staging
31+
if: ${{ env.DOCKERHUB_USERNAME != '' }}
2832

2933
- name: Tag release backend
30-
run: docker tag ${{ secrets.DOCKERHUB_USERNAME }}/cupcake:staging ${{ secrets.DOCKERHUB_USERNAME }}/cupcake:release
31-
if: ${{ secrets.DOCKERHUB_USERNAME != '' }}
34+
run: docker tag ${{ env.DOCKERHUB_USERNAME }}/cupcake:staging ${{ env.DOCKERHUB_USERNAME }}/cupcake:release
35+
if: ${{ env.DOCKERHUB_USERNAME != '' }}
3236

3337
- name: Tag release frontend
34-
run: docker tag ${{ secrets.DOCKERHUB_USERNAME }}/frosting:staging ${{ secrets.DOCKERHUB_USERNAME }}/frosting:release
35-
if: ${{ secrets.DOCKERHUB_USERNAME != '' }}
38+
run: docker tag ${{ env.DOCKERHUB_USERNAME }}/frosting:staging ${{ env.DOCKERHUB_USERNAME }}/frosting:release
39+
if: ${{ env.DOCKERHUB_USERNAME != '' }}
3640

3741
- name: Push release backend
38-
run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/cupcake:release
39-
if: ${{ secrets.DOCKERHUB_USERNAME != '' }}
42+
run: docker push ${{ env.DOCKERHUB_USERNAME }}/cupcake:release
43+
if: ${{ env.DOCKERHUB_USERNAME != '' }}
4044

4145
- name: Push release frontend
42-
run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/frosting:release
43-
if: ${{ secrets.DOCKERHUB_USERNAME != '' }}
46+
run: docker push ${{ env.DOCKERHUB_USERNAME }}/frosting:release
47+
if: ${{ env.DOCKERHUB_USERNAME != '' }}

0 commit comments

Comments
 (0)