fix: Use GitHub credentials for docker-publish CI check

openedx · Oct 6, 2021 · a5f5605 · a5f5605
1 parent 73ad1fa
commit a5f5605
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -19,4 +19,4 @@ jobs:
         env:
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-        run : make travis_docker_push
+        run : make docker_push
diff --git a/Makefile b/Makefile
@@ -113,14 +113,14 @@ dev.stop: # Stops containers so they can be restarted
 app-shell: # Run bash in the container as root
 	docker exec -u 0 -it edx.devstack.xblock-sdk bash
 
-travis_docker_auth:
-	echo "$$DOCKER_PASSWORD" | docker login -u "$$DOCKER_USERNAME" --password-stdin
+docker_auth:
+	echo "$$DOCKERHUB_PASSWORD" | docker login -u "$$DOCKERHUB_USERNAME" --password-stdin
 
-travis_docker_tag: docker_build
-	docker tag "openedx/xblock-sdk:latest" "openedx/xblock-sdk:$$TRAVIS_COMMIT"
+docker_tag: docker_build
+	docker tag "openedx/xblock-sdk:latest" "openedx/xblock-sdk:${GITHUB_SHA}"
 
-travis_docker_push: | travis_docker_auth travis_docker_tag ## push to docker hub
-	echo "$$TRAVIS_COMMIT"
+docker_push: | docker_auth docker_tag ## push to docker hub
+	echo "${GITHUB_SHA}"
 	docker images
 	docker -l debug push "openedx/xblock-sdk:latest"
-	docker -l debug push "openedx/xblock-sdk:$$TRAVIS_COMMIT"
+	docker -l debug push "openedx/xblock-sdk:${GITHUB_SHA}"