actions/lint
1
0
Fork 0
mirror of https://github.com/super-linter/super-linter.git synced 2024-11-22 14:10:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

small cleanup

Browse source
This commit is contained in:
Lucas Gravley 2020-08-20 13:18:17 -05:00
parent 815ff9d520
commit a59f74a287
3 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
.automation/upload-docker.sh
View file

@ -148,13 +148,16 @@ ValidateInput() {
fatal "[${IMAGE_REPO}]" fatal "[${IMAGE_REPO}]"
else else
info "Successfully found:${F[W]}[IMAGE_REPO]${F[B]}, value:${F[W]}[${IMAGE_REPO}]" info "Successfully found:${F[W]}[IMAGE_REPO]${F[B]}, value:${F[W]}[${IMAGE_REPO}]"
# Set the docker Image repo
DOCKER_IMAGE_REPO="${IMAGE_REPO}" DOCKER_IMAGE_REPO="${IMAGE_REPO}"
############################################### ###############################################
# Need to see if GCR registry and update name # # Need to see if GCR registry and update name #
############################################### ###############################################
if [[ ${REGISTRY} == "GCR" ]]; then if [[ ${REGISTRY} == "GCR" ]]; then
NAME="${GCR_URL}/${IMAGE_REPO}/${REPO_NAME}" NAME="${GCR_URL}/${IMAGE_REPO}/${REPO_NAME}"
# Set the default image repo
IMAGE_REPO="${NAME}" IMAGE_REPO="${NAME}"
# Set the GCR image repo
GCR_IMAGE_REPO="${IMAGE_REPO}" GCR_IMAGE_REPO="${IMAGE_REPO}"
info "Updated [IMAGE_REPO] to:[${IMAGE_REPO}] for GCR" info "Updated [IMAGE_REPO] to:[${IMAGE_REPO}] for GCR"
fi fi
@ -469,10 +472,14 @@ FindBuiltImage() {
# Check the local system to see if an image has already been built # Check the local system to see if an image has already been built
# if so, we only need to update tags and push # if so, we only need to update tags and push
# Set FOUND_IMAGE=1 when found # Set FOUND_IMAGE=1 when found
FOUND_DOCKER_RELASE=0
FOUND_DOCKER_MAJOR=0 ##############
FOUND_GCR_RELASE=0 # Local vars #
FOUND_GCR_MAJOR=0 ##############
FOUND_DOCKER_RELASE=0 # Flag if docker relase image is found
FOUND_DOCKER_MAJOR=0 # Flag if docker major image is found
FOUND_GCR_RELASE=0 # Flag if GCR releasae image is found
FOUND_GCR_MAJOR=0 # Flag if GCR major image is found
####################################### #######################################
# Look for Release image in DockerHub # # Look for Release image in DockerHub #
@ -489,6 +496,7 @@ FindBuiltImage() {
############################## ##############################
if [ $ERROR_CODE -ne 0 ]; then if [ $ERROR_CODE -ne 0 ]; then
info "Found Docker image:[$DOCKER_IMAGE_REPO:$IMAGE_VERSION] already built on instance" info "Found Docker image:[$DOCKER_IMAGE_REPO:$IMAGE_VERSION] already built on instance"
# Increment flag
FOUND_DOCKER_RELASE=1 FOUND_DOCKER_RELASE=1
else else
info "Failed to find locally created Docker image:[$DOCKERHUB_FIND_CMD]" info "Failed to find locally created Docker image:[$DOCKERHUB_FIND_CMD]"
@ -509,6 +517,7 @@ FindBuiltImage() {
############################## ##############################
if [ $ERROR_CODE -ne 0 ]; then if [ $ERROR_CODE -ne 0 ]; then
info "Found Docker image:[$DOCKER_IMAGE_REPO:$MAJOR_TAG] already built on instance" info "Found Docker image:[$DOCKER_IMAGE_REPO:$MAJOR_TAG] already built on instance"
# Increment flag
FOUND_DOCKER_MAJOR=1 FOUND_DOCKER_MAJOR=1
else else
info "Failed to find locally created Docker image:[$DOCKERHUB_FIND_CMD]" info "Failed to find locally created Docker image:[$DOCKERHUB_FIND_CMD]"
@ -529,6 +538,7 @@ FindBuiltImage() {
############################## ##############################
if [ $ERROR_CODE -ne 0 ]; then if [ $ERROR_CODE -ne 0 ]; then
info "Found Docker image:[$GCR_IMAGE_REPO:$IMAGE_VERSION] already built on instance" info "Found Docker image:[$GCR_IMAGE_REPO:$IMAGE_VERSION] already built on instance"
# Increment flag
FOUND_GCR_RELASE=1 FOUND_GCR_RELASE=1
else else
info "Failed to find locally created Docker image:[$GCR_FIND_CMD]" info "Failed to find locally created Docker image:[$GCR_FIND_CMD]"
@ -549,6 +559,7 @@ FindBuiltImage() {
############################## ##############################
if [ $ERROR_CODE -ne 0 ]; then if [ $ERROR_CODE -ne 0 ]; then
info "Found Docker image:[$GCR_IMAGE_REPO:$MAJOR_TAG] already built on instance" info "Found Docker image:[$GCR_IMAGE_REPO:$MAJOR_TAG] already built on instance"
# Increment flag
FOUND_GCR_MAJOR=1 FOUND_GCR_MAJOR=1
else else
info "Failed to find locally created Docker image:[$GCR_FIND_CMD]" info "Failed to find locally created Docker image:[$GCR_FIND_CMD]"
@ -614,12 +625,12 @@ if [[ ${REGISTRY} == "Docker" ]]; then
# Authenticate "Username" "Password" "Url" "Name" # Authenticate "Username" "Password" "Url" "Name"
Authenticate "${DOCKER_USERNAME}" "${DOCKER_PASSWORD}" "" "Dockerhub" Authenticate "${DOCKER_USERNAME}" "${DOCKER_PASSWORD}" "" "Dockerhub"
#################################### ######################################
# Login to GitHub Package Registry # # Login to GitHub Container Registry #
#################################### ######################################
elif [[ ${REGISTRY} == "GCR" ]]; then elif [[ ${REGISTRY} == "GCR" ]]; then
# Authenticate "Username" "Password" "Url" "Name" # Authenticate "Username" "Password" "Url" "Name"
Authenticate "${GCR_USERNAME}" "${GCR_TOKEN}" "https://${GCR_URL}" "GitHub Package Registry" Authenticate "${GCR_USERNAME}" "${GCR_TOKEN}" "https://${GCR_URL}" "GitHub Container Registry"
else else
######### #########

2
.github/workflows/deploy-PROD.yml vendored
View file

@ -65,6 +65,6 @@ jobs:
IMAGE_REPO: github/super-linter IMAGE_REPO: github/super-linter
IMAGE_VERSION: latest IMAGE_VERSION: latest
DOCKERFILE_PATH: Dockerfile DOCKERFILE_PATH: Dockerfile
REGISTRY: GPR REGISTRY: GCR
shell: bash shell: bash
run: .automation/upload-docker.sh run: .automation/upload-docker.sh

2
.github/workflows/deploy-RELEASE.yml vendored
View file

@ -65,6 +65,6 @@ jobs:
IMAGE_REPO: github/super-linter IMAGE_REPO: github/super-linter
IMAGE_VERSION: ${{ github.event.release.tag_name }} IMAGE_VERSION: ${{ github.event.release.tag_name }}
DOCKERFILE_PATH: Dockerfile DOCKERFILE_PATH: Dockerfile
REGISTRY: GPR REGISTRY: GCR
shell: bash shell: bash
run: .automation/upload-docker.sh run: .automation/upload-docker.sh