From a8a0b1826a1366be8e6e63ec5aca7a22705561de Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Mon, 6 Jan 2020 15:54:48 -0700 Subject: [PATCH] Attempt drone docker tagging from .tags --- .drone.yml | 3 --- .gitignore | 1 + scripts/package-image | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index b334c5072d..73c085c967 100644 --- a/.drone.yml +++ b/.drone.yml @@ -47,7 +47,6 @@ steps: password: from_secret: docker_password repo: "rancher/k3s" - tag: "${DRONE_TAG}-amd64" username: from_secret: docker_username when: @@ -142,7 +141,6 @@ steps: password: from_secret: docker_password repo: "rancher/k3s" - tag: "${DRONE_TAG}-arm64" username: from_secret: docker_username when: @@ -220,7 +218,6 @@ steps: password: from_secret: docker_password repo: "rancher/k3s" - tag: "${DRONE_TAG}-arm" username: from_secret: docker_username when: diff --git a/.gitignore b/.gitignore index be9c881c17..f09af2a95b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.swp /.dapper +/.tags /.idea /.trash-cache /.vagrant diff --git a/scripts/package-image b/scripts/package-image index 5acece1f0d..1a434a16cc 100755 --- a/scripts/package-image +++ b/scripts/package-image @@ -12,3 +12,4 @@ IMAGE_NAME=${IMAGE_NAME:-k3s} IMAGE=${REPO}/${IMAGE_NAME}:${TAG} docker build -t ${IMAGE} -f package/Dockerfile . echo Built ${IMAGE} +echo ${VERSION_TAG}-${ARCH} >.tags