github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix image tags, replace + with -

pull/1186/head
Erik Wilson 2019-12-11 18:53:02 -07:00
parent bddab9479c
commit 07028a3115
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/package-image
View File

@ -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}

2
scripts/sonobuoy-e2e-tests
View File

@ -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}

3
scripts/version.sh
View File

@ -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