Merge pull request #903 from haoming29/fix-docker-image-name

Replace `pelican` with server name for production image

.github/workflows/build-prod-container.yml

@@ -124,11 +124,12 @@ jobs:
 
           echo $GITHUB_TAG
 
-          docker_repo="pelican_platform/pelican"
+          docker_repo="pelican_platform"
+          image_name=${{ matrix.image }}
           tag_list=()
           for registry in hub.opensciencegrid.org; do
             for image_tag in "$GITHUB_TAG"; do
-              tag_list+=("$registry/$docker_repo":"$image_tag")
+              tag_list+=("$registry/$docker_repo/$image_name":"$image_tag")
             done
           done
           # This causes the tag_list array to be comma-separated below,

images/entrypoint.sh

@@ -118,15 +118,15 @@ if [ $# -ne 0 ]; then
         pelican)
             # Run pelican with the rest of the arguments
             echo "Running pelican with arguments: $@"
-            exec tini /pelican/pelican "$@"
+            exec tini -- /pelican/pelican "$@"
             # we shouldn't get here
             echo >&2 "Exec of tini failed!"
             exit 1
             ;;
         osdf)
             # Run osdf with the rest of the arguments
             echo "Running osdf with arguments: $@"
-            exec tini /pelican/osdf "$@"
+            exec tini -- /pelican/osdf "$@"
             # we shouldn't get here
             echo >&2 "Exec of tini failed!"
             exit 1