Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
836b5996
Commit
836b5996
authored
Mar 07, 2017
by
Jeff Grafton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Silence error messages from docker rmi calls we expect to fail
parent
7593a9f5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
release.sh
build/lib/release.sh
+1
-1
Makefile
build/pause/Makefile
+1
-1
Makefile
cluster/addons/addon-manager/Makefile
+1
-1
common.sh
cluster/common.sh
+2
-2
Makefile
cluster/images/hyperkube/Makefile
+1
-1
No files found.
build/lib/release.sh
View file @
836b5996
...
...
@@ -309,7 +309,7 @@ function kube::release::create_docker_images_for_server() {
if
[[
-n
"
${
KUBE_DOCKER_IMAGE_TAG
-
}
"
&&
-n
"
${
KUBE_DOCKER_REGISTRY
-
}
"
]]
;
then
local
release_docker_image_tag
=
"
${
KUBE_DOCKER_REGISTRY
}
/
${
binary_name
}
-
${
arch
}
:
${
KUBE_DOCKER_IMAGE_TAG
}
"
kube::log::status
"Tagging docker image
${
docker_image_tag
}
as
${
release_docker_image_tag
}
"
docker rmi
"
${
release_docker_image_tag
}
"
||
true
"
${
DOCKER
[@]
}
"
rmi
"
${
release_docker_image_tag
}
"
2>/dev/null
||
true
"
${
DOCKER
[@]
}
"
tag
"
${
docker_image_tag
}
"
"
${
release_docker_image_tag
}
"
2>/dev/null
fi
...
...
build/pause/Makefile
View file @
836b5996
...
...
@@ -80,7 +80,7 @@ container: .container-$(ARCH)
.container-$(ARCH)
:
bin/$(BIN)-$(ARCH)
docker build
--pull
-t
$(IMAGE)
:
$(TAG)
--build-arg
ARCH
=
$(ARCH)
.
ifeq
($(ARCH),amd64)
docker rmi $(LEGACY_AMD64_IMAGE)
:
$(TAG) || true
docker rmi $(LEGACY_AMD64_IMAGE)
:
$(TAG)
2>/dev/null
|| true
docker tag
$(IMAGE)
:
$(TAG)
$(LEGACY_AMD64_IMAGE)
:
$(TAG)
endif
touch
$@
...
...
cluster/addons/addon-manager/Makefile
View file @
836b5996
...
...
@@ -52,7 +52,7 @@ push: build
gcloud docker
--
push
$(IMAGE)
-
$(ARCH)
:
$(VERSION)
ifeq
($(ARCH),amd64)
# Backward compatibility. TODO: deprecate this image tag
docker rmi $(IMAGE)
:
$(VERSION) || true
docker rmi $(IMAGE)
:
$(VERSION)
2>/dev/null
|| true
docker tag
$(IMAGE)
-
$(ARCH)
:
$(VERSION)
$(IMAGE)
:
$(VERSION)
gcloud docker
--
push
$(IMAGE)
:
$(VERSION)
endif
...
...
cluster/common.sh
View file @
836b5996
...
...
@@ -517,8 +517,8 @@ function stage-images() {
local
docker_tag
=
"
$(
cat
${
temp_dir
}
/kubernetes/server/bin/
${
binary
}
.docker_tag
)
"
(
"
${
docker_cmd
[@]
}
"
load
-i
"
${
temp_dir
}
/kubernetes/server/bin/
${
binary
}
.tar"
docker rmi
"
${
KUBE_DOCKER_REGISTRY
}
/
${
binary
}
:
${
KUBE_IMAGE_TAG
}
"
||
true
"
${
docker_cmd
[@]
}
"
tag
"gcr.io/google_containers/
${
binary
}
:
${
docker_tag
}
"
"
${
KUBE_DOCKER_REGISTRY
}
/
${
binary
}
:
${
KUBE_IMAGE_TAG
}
"
"
${
docker_cmd
[@]
}
"
rmi
"
${
KUBE_DOCKER_REGISTRY
}
/
${
binary
}
:
${
KUBE_IMAGE_TAG
}
"
2>/dev/null
||
true
"
${
docker_cmd
[@]
}
"
tag
"gcr.io/google_containers/
${
binary
}
:
${
docker_tag
}
"
"
${
KUBE_DOCKER_REGISTRY
}
/
${
binary
}
:
${
KUBE_IMAGE_TAG
}
"
"
${
docker_push_cmd
[@]
}
"
push
"
${
KUBE_DOCKER_REGISTRY
}
/
${
binary
}
:
${
KUBE_IMAGE_TAG
}
"
)
&>
"
${
temp_dir
}
/
${
binary
}
-push.log"
&
done
...
...
cluster/images/hyperkube/Makefile
View file @
836b5996
...
...
@@ -116,7 +116,7 @@ endif
push
:
build
gcloud docker
--
push
${
REGISTRY
}
/hyperkube-
${
ARCH
}
:
${
VERSION
}
ifeq
($(ARCH),amd64)
docker rmi ${REGISTRY}/hyperkube
:
${VERSION} || true
docker rmi ${REGISTRY}/hyperkube
:
${VERSION}
2>/dev/null
|| true
docker tag
${
REGISTRY
}
/hyperkube-
${
ARCH
}
:
${
VERSION
}
${
REGISTRY
}
/hyperkube:
${
VERSION
}
gcloud docker
--
push
${
REGISTRY
}
/hyperkube:
${
VERSION
}
endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment