Images can be pushed to GPR or Dockerhub

supply github token for test

dockerhub specific settings

try to make tests "fork agnostic"

try to make tests "fork agnostic". still don't know if this works

action names cannot be fork agnostic

fixed typo

Author: Patrick Poetz

.github/workflows/dockerhub.yml

@@ -0,0 +1,22 @@
+name: Test Dockerhub Push
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Copy Repo Files
+        uses: actions/checkout@v1
+        with:
+          fetch-depth: 1
+      - name: Build and Publish Docker image to Dockerhub
+        uses: saubermacherag/gpr-docker-publish@master
+        with:
+          TAG: 'my-optional-tag-name'
+          DOCKERFILE_PATH: '.github/docker/Dockerfile'
+          BUILD_CONTEXT: '.'
+          DOCKERHUB_REPOSITORY: 'pinkrobin/gpr-docker-publish-example'
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+        env:
+          REGISTRY_TOKEN: ${{ secrets.DOCKERHUB_PAT }}

.github/workflows/test.yaml renamed to .github/workflows/gpr.yaml

@@ -1,4 +1,4 @@
-name: Tests
+name: Test GPR Push
 on: push
 
 jobs:
@@ -7,14 +7,15 @@ jobs:
     steps:
 
     - name: Copy Repo Files
-      uses: actions/checkout@master
-
+      uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
     - name: Publish Docker Image to GPR
-      uses: machine-learning-apps/gpr-docker-publish@master
+      uses: saubermacherag/gpr-docker-publish@master
       with:
         IMAGE_NAME: 'test-docker-action-v2'
         TAG: 'my-optional-tag-name'
         DOCKERFILE_PATH: 'Dockerfile'
         BUILD_CONTEXT: '.'
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        REGISTRY_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/main.yml

@@ -60,18 +60,19 @@ jobs:
         DOCKERFILE_PATH: 'argo/gpu.Dockerfile'
         BUILD_CONTEXT: 'argo/'
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        REGISTRY_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     #To access another docker registry like dockerhub you'll have to add `DOCKERHUB_UERNAME` and `DOCKERHUB_PAT` in github secrets.
     - name: Build and Publish Docker image to Dockerhub instead of GPR
       uses: saubermacherag/gpr-docker-publish@master
       with:
-        USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-        PASSWORD: ${{ secrets.DOCKERHUB_PAT }}
         IMAGE_TAG: 'v0.0'
         DOCKERFILE_PATH: '.github/docker/Dockerfile'
         BUILD_CONTEXT: './'
         DOCKERHUB_REPOSITORY: 'pinkrobin/gpr-docker-publish-example'
+        DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      env:
+        REGISTRY_TOKEN: ${{ secrets.DOCKERHUB_PAT }}
 
     # This second step is illustrative and shows how to reference the 
     # output variables.  This is completely optional.
@@ -96,6 +97,7 @@ jobs:
 2. `tag`: a custom tag you wish to assign to the image.
 3. `DOCKERHUB_REPOSITORY`: if value is set, you don't need to set `IMAGE_NAME`. It will push the image to the given dockerhub repository instead of using GPR.
 Why? Because Github Actions don't support downloading images without authentication at the moment. See: https://github.community/t5/GitHub-Actions/docker-pull-from-public-GitHub-Package-Registry-fail-with-quot/m-p/32782
+4. `DOCKERHUB_USERNAME`: required when `DOCKERHUB_REPOSITORY` set to true.
 
 ## Outputs
 

README.md

@@ -23,6 +23,9 @@ inputs:
   dockerhub_repository:
     description: Optional input to push image to dockerhub repository instead of GPR.
     required: false
+  dockerhub_username:
+    description: Required if dockerhub_repository set to true.
+    required: false
 outputs:
   IMAGE_SHA_NAME:
     description: name of the Docker Image including the tag

action.yml

@@ -7,8 +7,8 @@
 set -e
 
 #check inputs
-if [[ -z "$GITHUB_TOKEN" ]]; then
-	echo "You must supply the environment variable GITHUB_TOKEN."
+if [[ -z "$REGISTRY_TOKEN" ]]; then
+	echo "You must supply the environment variable REGISTRY_TOKEN."
 	exit 1
 fi
 
@@ -33,15 +33,22 @@ fi
 if [[ -z "$INPUT_DOCKERHUB_REPOSITORY" ]]; then
   DOCKER_REGISTRY=docker.pkg.github.com
   BASE_NAME="${DOCKER_REGISTRY}/${GITHUB_REPOSITORY}/${INPUT_IMAGE_NAME}"
+  # send credentials through stdin (it is more secure)
+  user=$(curl -s -H "Authorization: token ${REGISTRY_TOKEN}" https://api.github.com/user | jq -r .login)
+  # lowercase the username
+  username="$(echo ${user} | tr "[:upper:]" "[:lower:]")"
 else
+  if [ -z "$INPUT_DOCKERHUB_USERNAME" ]
+  then
+    echo "If you use Docker Hub as repository please provide your username as DOCKERHUB_USERNAME."
+    exit 1
+  fi
+  username="${INPUT_DOCKERHUB_USERNAME}"
   BASE_NAME="${INPUT_DOCKERHUB_REPOSITORY}"
 fi
 
-# send credentials through stdin (it is more secure)
-user=$(curl -s -H "Authorization: token ${GITHUB_TOKEN}" https://api.github.com/user | jq -r .login)
-# lowercase the username
-username="$(echo ${user} | tr "[:upper:]" "[:lower:]")"
-echo ${GITHUB_TOKEN} | docker login -u "${username}" --password-stdin ${DOCKER_REGISTRY}
+
+echo ${REGISTRY_TOKEN} | docker login -u "${username}" --password-stdin ${DOCKER_REGISTRY}
 
 # Set Local Variables
 shortSHA=$(echo "${GITHUB_SHA}" | cut -c1-12)