Skip to content

Commit 95bc542

Browse files
uses read and publish docker env variables according to scope (#49)
* uses read and publish env variables accordingly * Update .github/workflows/merge-publish.yml Co-authored-by: Aaron Steinfeld <[email protected]> * Update .github/workflows/publish.yml Co-authored-by: Aaron Steinfeld <[email protected]> Co-authored-by: Aaron Steinfeld <[email protected]>
1 parent 8137e08 commit 95bc542

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

.github/workflows/merge-publish.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ jobs:
3333
- name: Login to Docker Hub
3434
uses: docker/login-action@v1
3535
with:
36-
username: ${{ secrets.DOCKERHUB_USERNAME }}
37-
password: ${{ secrets.DOCKERHUB_TOKEN }}
36+
username: ${{ secrets.DOCKERHUB_READ_USER }}
37+
password: ${{ secrets.DOCKERHUB_READ_TOKEN }}
3838

3939
- name: push docker image
4040
run: ./gradlew dockerPushImages
4141
env:
42-
DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
43-
DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
42+
DOCKER_USERNAME: ${{ secrets.DOCKERHUB_PUBLISH_USER }}
43+
DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_PUBLISH_TOKEN }}

.github/workflows/pr-build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ jobs:
3535
- name: Login to Docker Hub
3636
uses: docker/login-action@v1
3737
with:
38-
username: ${{ secrets.DOCKERHUB_USERNAME }}
39-
password: ${{ secrets.DOCKERHUB_TOKEN }}
38+
username: ${{ secrets.DOCKERHUB_READ_USER }}
39+
password: ${{ secrets.DOCKERHUB_READ_TOKEN }}
4040

4141
- name: Build with Gradle
4242
run: ./gradlew build dockerBuildImages
@@ -46,8 +46,8 @@ jobs:
4646
container:
4747
image: hypertrace/helm-gcs-packager:0.3.0
4848
credentials:
49-
username: ${{ secrets.DOCKERHUB_USERNAME }}
50-
password: ${{ secrets.DOCKERHUB_TOKEN }}
49+
username: ${{ secrets.DOCKERHUB_READ_USER }}
50+
password: ${{ secrets.DOCKERHUB_READ_TOKEN }}
5151
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
5252
steps:
5353
- name: Check out code

.github/workflows/publish.yml

+9-7
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,25 @@ jobs:
3232
- name: Login to Docker Hub
3333
uses: docker/login-action@v1
3434
with:
35-
username: ${{ secrets.DOCKERHUB_USERNAME }}
36-
password: ${{ secrets.DOCKERHUB_TOKEN }}
35+
username: ${{ secrets.DOCKERHUB_READ_USER }}
36+
password: ${{ secrets.DOCKERHUB_READ_TOKEN }}
3737

38-
- name: Publish docker image
38+
- name: publish docker image
3939
run: ./gradlew publish dockerPushImages
4040
env:
41-
DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
42-
DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
41+
DOCKER_USERNAME: ${{ secrets.DOCKERHUB_PUBLISH_USER }}
42+
DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_PUBLISH_TOKEN }}
43+
ORG_GRADLE_PROJECT_publishUser: ${{ secrets.BINTRAY_USER }}
44+
ORG_GRADLE_PROJECT_publishApiKey: ${{ secrets.BINTRAY_API_KEY }}
4345

4446
publish-helm-charts:
4547
needs: publish-images
4648
runs-on: ubuntu-20.04
4749
container:
4850
image: hypertrace/helm-gcs-packager:0.3.0
4951
credentials:
50-
username: ${{ secrets.DOCKERHUB_USERNAME }}
51-
password: ${{ secrets.DOCKERHUB_TOKEN }}
52+
username: ${{ secrets.DOCKERHUB_READ_USER }}
53+
password: ${{ secrets.DOCKERHUB_READ_TOKEN }}
5254
steps:
5355
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
5456
- name: Checkout Repository

0 commit comments

Comments
 (0)