Skip to content

Commit 0954579

Browse files
committed
feat(62035): fixes
1 parent 5a554f9 commit 0954579

File tree

3 files changed

+21
-24
lines changed

3 files changed

+21
-24
lines changed

.github/workflows/ci-cd-java.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: ci-cd-java.yml
22
on:
33
workflow_call:
4+
secrets:
5+
DOCKER_USERNAME:
6+
required: true
7+
DOCKER_PASSWORD:
8+
required: true
49
inputs:
510
uploadJarArtifact:
611
required: false
@@ -12,12 +17,6 @@ on:
1217
jarArtifactPath:
1318
required: false
1419
type: string
15-
dockerUser:
16-
required: true
17-
type: string
18-
dockerPassword:
19-
required: true
20-
type: string
2120

2221
env:
2322
IMAGE_NAME_MIXED_CASE: "${{ github.repository }}"
@@ -94,8 +93,8 @@ jobs:
9493
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop'
9594
uses: docker/login-action@v3
9695
with:
97-
username: ${{ inputs.dockerUser }}
98-
password: ${{ inputs.dockerPassword }}
96+
username: ${{ secrets.DOCKER_USERNAME }}
97+
password: ${{ secrets.DOCKER_PASSWORD }}
9998

10099
- name: Build & Push Docker image
101100
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop'

.github/workflows/ci-cd-kotlin.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: ci-cd-kotlin.yml
22
on:
33
workflow_call:
4+
secrets:
5+
DOCKER_USERNAME:
6+
required: true
7+
DOCKER_PASSWORD:
8+
required: true
49
inputs:
510
uploadJarArtifact:
611
required: false
@@ -12,12 +17,6 @@ on:
1217
jarArtifactPath:
1318
required: false
1419
type: string
15-
dockerUser:
16-
required: true
17-
type: string
18-
dockerPassword:
19-
required: true
20-
type: string
2120

2221
env:
2322
IMAGE_NAME_MIXED_CASE: "${{ github.repository }}"
@@ -85,13 +84,13 @@ jobs:
8584
labels: |
8685
org.opencontainers.image.title=${{ env.IMAGE_NAME }}
8786
org.opencontainers.image.vendor=hsldevcom
88-
87+
8988
- name: Login to Docker Hub
9089
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop'
9190
uses: docker/login-action@v3
9291
with:
93-
username: ${{ inputs.dockerUser }}
94-
password: ${{ inputs.dockerPassword }}
92+
username: ${{ secrets.DOCKER_USERNAME }}
93+
password: ${{ secrets.DOCKER_PASSWORD }}
9594

9695
- name: Build & Push Docker image
9796
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop'

.github/workflows/ci-cd-typescript.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
name: ci-cd-typescript.yml
22
on:
33
workflow_call:
4-
inputs:
5-
dockerUser:
4+
secrets:
5+
DOCKER_USERNAME:
66
required: true
7-
type: string
8-
dockerPassword:
7+
DOCKER_PASSWORD:
98
required: true
10-
type: string
9+
inputs:
1110
uploadJarArtifact:
1211
required: false
1312
type: boolean
@@ -89,8 +88,8 @@ jobs:
8988
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags/'))
9089
uses: docker/login-action@v3
9190
with:
92-
username: ${{ inputs.dockerUser }}
93-
password: ${{ inputs.dockerPassword }}
91+
username: ${{ secrets.DOCKER_USERNAME }}
92+
password: ${{ secrets.DOCKER_PASSWORD }}
9493

9594
- name: Build and push
9695
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags/'))

0 commit comments

Comments
 (0)