Extracts Dockerhub login to Github action

MobileDevOps · Mar 20, 2023 · 49ff438 · 49ff438
1 parent 92b2d43
commit 49ff438
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -11,4 +11,9 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - run: make build
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -14,4 +14,9 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - run: make release
diff --git a/.github/workflows/staging.yaml b/.github/workflows/staging.yaml
@@ -11,4 +11,9 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - run: make build
diff --git a/Makefile b/Makefile
@@ -1,11 +1,8 @@
-DOCKER_USER := $(DOCKER_USER)
-DOCKER_PASS := $(DOCKER_PASS)
 IMAGE_TAG := $(IMAGE_TAG)
 IMAGE := mobiledevops/android-sdk-image
 
 release: \
 	tag_image \
-	dockerhub_login \
 	dockerhub_push \
 
 tag_image: build
@@ -14,11 +11,8 @@ tag_image: build
 build:
 	docker build -t $(IMAGE) .
 
-dockerhub_login:
-	echo $(DOCKER_PASS) | docker login -u $(DOCKER_USER) --password-stdin
-
 dockerhub_push:
 	docker push $(IMAGE):latest \
 	&& docker push "$(IMAGE):$(IMAGE_TAG)"
 
-.PHONY: release tag_image build dockerhub_login dockerhub_push
+.PHONY: release tag_image build dockerhub_push