Commit fec98fa8 authored by Brian Long's avatar Brian Long
Browse files

updated cicd shell scripts after tests

parent 64b73038

cicd/push-auth.sh→cicd/auth.sh

+0 −0

File moved.

View file

cicd/build.sh

+6 −3
Original line number Diff line number Diff line
@@ -21,15 +21,18 @@ skopeo ${SKOPEO_OPTS} inspect docker://${CONTAINERD_IMAGE_REMOTE_NAME}:sha${GIT_ 
SKOPEO_INSPECT_RC=$?

set -e



if [[ "${INSPECT_RC}" == "0" ]]; then

if (( ${SKOPEO_INSPECT_RC} == 0 )); then

  echo "Container image already built; skipping rebuild"

else

  THISDIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

  cd ${THISDIR}/../containerd



  echo "Building container image"

  ${CONTAINERD_CMD} ${CONTAINERD_CMD_OPTS} build \

    --format=${CONTAINERD_BUILD_FORMAT} \

    ${CONTAINERD_BUILD_OPTS} \

    --build-arg DEBIAN_VERSION=${DEBIAN_VERSION} \

    --build-arg CONTAINERD_REGISTRY_HOST=${CONTAINERD_REGISTRY_HOST} \

    --build-arg CONTAINERD_IMAGE_NAMESPACE=${CONTAINERD_IMAGE_NAMESPACE} \

    --tag ${CONTAINERD_IMAGE_REMOTE_NAME}:sha${GIT_COMMIT_SHORT_SHA}



  cd -

fi

cicd/push-version.sh

+6 −3
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ if [[ ! -z $1 ]]; then 
  CONTAINERD_IMAGE_TAG=$1

elif [[ ! -z ${VERSION} ]]; then

  CONTAINERD_IMAGE_TAG=${VERSION}

elif [[ -z ${CONTAINERD_IMAGE_TAG} ]]; then

  echo "An argument, 'VERSION', or 'CONTAINERD_IMAGE_TAG' environment variable are required"

  exit 1

fi



GIT_COMMIT_SHORT_SHA=$(git rev-parse --short HEAD)
@@ -22,11 +25,11 @@ CONTAINERD_IMAGE_REMOTE_NAME=${CONTAINERD_REGISTRY_HOST}/${CONTAINERD_IMAGE_NAME 
echo "Synchronizing container image from registry for SHA: ${GIT_COMMIT_SHORT_SHA}"

${CONTAINERD_CMD} ${CONTAINERD_CMD_OPTS} pull \

  ${CONTAINERD_IMAGE_REMOTE_NAME}:sha${GIT_COMMIT_SHORT_SHA}

${CONTAINERD_CMD} ${CONTAINERD_CMD_OPTS} tag \

  ${CONTAINERD_IMAGE_REMOTE_NAME}:sha${GIT_COMMIT_SHORT_SHA}

  ${CONTAINERD_IMAGE_REMOTE_NAME}:${CONTAINERD_IMAGE_TAG}



echo "Tagging container image to registry with version: ${CONTAINERD_IMAGE_TAG}"

${CONTAINERD_CMD} ${CONTAINERD_CMD_OPTS} tag \

  ${CONTAINERD_IMAGE_REMOTE_NAME}:sha${GIT_COMMIT_SHORT_SHA} \

  ${CONTAINERD_IMAGE_REMOTE_NAME}:${CONTAINERD_IMAGE_TAG}

${CONTAINERD_CMD} ${CONTAINERD_CMD_OPTS} push \

  ${CONTAINERD_PUSH_OPTS} \

  ${CONTAINERD_IMAGE_REMOTE_NAME}:${CONTAINERD_IMAGE_TAG}