From 7ab2ec7c2883a363d98384b79f0a7693d8c06432 Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Tue, 1 Sep 2020 12:44:05 -0500 Subject: [PATCH 1/2] adding new url --- .automation/upload-docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.automation/upload-docker.sh b/.automation/upload-docker.sh index e7997b01..b9c0696b 100755 --- a/.automation/upload-docker.sh +++ b/.automation/upload-docker.sh @@ -29,7 +29,7 @@ IMAGE_VERSION="${IMAGE_VERSION}" # Version to tag the image DOCKERFILE_PATH="${DOCKERFILE_PATH}" # Path to the Dockerfile to be uploaded MAJOR_TAG='' # Major tag version if we need to update it UPDATE_MAJOR_TAG=0 # Flag to deploy the major tag version as well -GCR_URL='containers.pkg.github.com' # URL to Github Container Registry +GCR_URL='ghcr.io' # URL to Github Container Registry DOCKER_IMAGE_REPO='' # Docker tag for the image when created GCR_IMAGE_REPO='' # Docker tag for the image when created FOUND_IMAGE=0 # Flag for if the image has already been built From eb8dc5cf7484405f4e357b52441a9f9450abcdf4 Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Tue, 1 Sep 2020 12:57:10 -0500 Subject: [PATCH 2/2] fix bug --- .automation/upload-docker.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.automation/upload-docker.sh b/.automation/upload-docker.sh index b9c0696b..c390fda4 100755 --- a/.automation/upload-docker.sh +++ b/.automation/upload-docker.sh @@ -166,7 +166,7 @@ ValidateInput() { ############################## # Get the name of the branch # ############################## - BRANCH_NAME=$(git -C "${GITHUB_WORKSPACE}" branch --contains "${GITHUB_SHA}" | awk '{print ${2}}' 2>&1) + BRANCH_NAME=$(git -C "${GITHUB_WORKSPACE}" branch --contains "${GITHUB_SHA}" | awk '{print $2}' 2>&1) ####################### # Load the error code # @@ -448,9 +448,9 @@ UploadImage() { ################ # Get the data # ################ - REPO=$(echo "${GET_INFO_CMD}" | awk '{print ${1}}') - TAG=$(echo "${GET_INFO_CMD}" | awk '{print ${2}}') - IMAGE_ID=$(echo "${GET_INFO_CMD}" | awk '{print ${3}}') + REPO=$(echo "${GET_INFO_CMD}" | awk '{print $1}') + TAG=$(echo "${GET_INFO_CMD}" | awk '{print $2}') + IMAGE_ID=$(echo "${GET_INFO_CMD}" | awk '{print $3}') SIZE="${GET_INFO_CMD##* }" ###################