Merge pull request #1 from roromix/master

Give the ability to use docker hub private image

Author: LGinC

README.md

@@ -23,6 +23,9 @@ portainer终结点id，默认是1,即第一个，一般为localhost
 **required** name of stack <br>
 服务栈的名称，会在stacks列表里显示
 
+## registry
+address of registry, like: myregistry.example.com (leave empty for Docker Hub) <br>
+
 ## imagename
 **required** name of pull image, like:  mcr.microsoft.com/dotnet/core/aspnet:3.1-alpine <br>
 将会进行拉取镜像的镜像名
@@ -54,7 +57,8 @@ The following will delete it if same name stack is existed.
     password: ${{ secrets.PORTAINER_PASSWORD }}
     endpointId: 1
     stackname: dotnet_test
-    imagename: mcr.microsoft.com/dotnet/core/aspnet:3.1-alpine
+    registry: mcr.microsoft.com
+    imagename: dotnet/core/aspnet:3.1-alpine
     docker_compose: |
       version: "2"
       services:

action.yml

@@ -21,6 +21,10 @@ inputs:
   stackname:
     description: 'name of stack, lowercase'
     required: true
+  registry:
+    description: 'image registry'
+    required: false
+    default: ''
   imagename:
     description: 'deploy image name'
     required: true

entrypoint.sh

@@ -31,16 +31,9 @@ fi
 #pull image  
 #拉取镜像
 echo "pull image: $INPUT_IMAGENAME"
-registry=$(echo "$INPUT_IMAGENAME" | awk -F'/' '{print $1}')
-if [[ "$registry" =~ "." ]]
-then
-    base64Registry=$(echo "{\"serveraddress\":\"$registry\"}" | base64)
-    curl --location --request POST ''${INPUT_SERVERURL}'/api/endpoints/'$INPUT_ENDPOINTID'/docker/images/create?fromImage='$INPUT_IMAGENAME'' \
-    -H "Authorization: Bearer $token"  -H "X-Registry-Auth: $base64Registry"
-else
-    curl --location --request POST ''${INPUT_SERVERURL}'/api/endpoints/'$INPUT_ENDPOINTID'/docker/images/create?fromImage='$INPUT_IMAGENAME'' \
-    -H "Authorization: Bearer $token"
-fi
+base64Registry=$(echo "{\"serveraddress\":\"$INPUT_REGISTRY\"}" | base64)
+curl --location --request POST ''${INPUT_SERVERURL}'/api/endpoints/'$INPUT_ENDPOINTID'/docker/images/create?fromImage='$INPUT_IMAGENAME'' \
+-H "Authorization: Bearer $token"  -H "X-Registry-Auth: $base64Registry"
 
 
 
@@ -107,4 +100,4 @@ if [ "$message" != "null" ]; then
   echo "create failed: $message"
   exit 1
 fi
-exit 0
+exit 0