Skip to content

K
k3s
Commit 07028a31 authored by Erik Wilson's avatar Erik Wilson
Browse files
Options

Fix image tags, replace + with -

parent bddab947
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
scripts/package-image
View file @ 07028a31
...@@ -5,7 +5,7 @@ cd $(dirname $0)/.. ...@@ -5,7 +5,7 @@ cd $(dirname $0)/..
. ./scripts/version.sh . ./scripts/version.sh
TAG=${TAG:-${VERSION}${SUFFIX}} TAG=${TAG:-${VERSION_TAG}${SUFFIX}}
REPO=${REPO:-rancher} REPO=${REPO:-rancher}
IMAGE_NAME=${IMAGE_NAME:-k3s} IMAGE_NAME=${IMAGE_NAME:-k3s}
......
scripts/sonobuoy-e2e-tests
View file @ 07028a31
...@@ -5,7 +5,7 @@ cd $(dirname $0)/.. ...@@ -5,7 +5,7 @@ cd $(dirname $0)/..
if [ -z "$K3S_IMAGE" ]; then if [ -z "$K3S_IMAGE" ]; then
. ./scripts/version.sh . ./scripts/version.sh
TAG=${TAG:-${VERSION}${SUFFIX}} TAG=${TAG:-${VERSION_TAG}${SUFFIX}}
REPO=${REPO:-rancher} REPO=${REPO:-rancher}
IMAGE_NAME=${IMAGE_NAME:-k3s} IMAGE_NAME=${IMAGE_NAME:-k3s}
export K3S_IMAGE=${REPO}/${IMAGE_NAME}:${TAG} export K3S_IMAGE=${REPO}/${IMAGE_NAME}:${TAG}
......
scripts/version.sh
View file @ 07028a31
...@@ -30,5 +30,6 @@ VERSION_CNIPLUGINS="v0.7.6-k3s1" ...@@ -30,5 +30,6 @@ VERSION_CNIPLUGINS="v0.7.6-k3s1"
if [[ -n "$GIT_TAG" ]]; then if [[ -n "$GIT_TAG" ]]; then
VERSION=$GIT_TAG VERSION=$GIT_TAG
else else
VERSION="$(sed -e 's/[-+].*//' <<< "$VERSION_K8S")+$COMMIT$DIRTY" VERSION="$(sed -e 's/[-+].*//' <<< "$VERSION_K8S")+$COMMIT"
VERSION_TAG="$(sed -e 's/+/-/g' <<< "$VERSION")"
fi fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment