github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-28 05:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Fix base image discrepancy when building kubemark.

Browse Source 
There are two ways of building kubemark: 1) via Dockerfile and 2) via
bazel.

In CI/CD tests we use the 1) way and use debian:jessie as the base
image.

But if you build kubemark via bazel it will use the discouraged busybox
base image.

This PR fixes that by using debian:jessie everywehre and pinning exact
sha version to make the kubemark image hermetic.
This commit is contained in:
Matt Matejczyk
2019-10-23 13:33:32 +02:00
parent 5f03d33fc9
commit 686245b876
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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