github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84231 from mm4tt/kubemark_busybox

Browse Source 
Fix base image discrepancy when building kubemark images
This commit is contained in:
Kubernetes Prow Robot 2019-10-24 04:51:08 -07:00 committed by GitHub
commit e4bb49a231
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/root/WORKSPACE
View File

@ -73,11 +73,11 @@ container_repositories()
load("@io_bazel_rules_docker//container:container.bzl", "container_pull")
container_pull(
name = "official_busybox",
digest = "sha256:5e8e0509e829bb8f990249135a36e81a3ecbe94294e7a185cc14616e5fad96bd",
name = "debian_jessie",
digest = "sha256:e25703ee6ab5b2fac31510323d959cdae31eebdf48e88891c549e55b25ad7e94",
registry = "index.docker.io",
repository = "library/busybox",
tag = "latest", # ignored, but kept here for documentation
repository = "library/debian",
tag = "jessie", # ignored when digest provided, but kept here for documentation.
)
load("//build:workspace.bzl", "release_dependencies")

2
cluster/images/kubemark/BUILD
View File

@ -4,7 +4,7 @@ load("@io_bazel_rules_docker//container:container.bzl", "container_image", "cont
container_image(
name = "image",
base = "@official_busybox//image",
base = "@debian_jessie//image",
entrypoint = ["/kubemark"],
files = ["//cmd/kubemark"],
stamp = True,

4
cluster/images/kubemark/Dockerfile
View File

@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM debian:jessie
# The line below points to debian:jessie as of 2019-10-23. The SHA should be
# kept in sycn with debian_jessie definition in the WORKSPACE file.
FROM debian@sha256:e25703ee6ab5b2fac31510323d959cdae31eebdf48e88891c549e55b25ad7e94
COPY kubemark /kubemark