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

Merge pull request #48535 from mkumatag/debian_base 

Automatic merge from submit-queue (batch tested with PRs 48914, 48535, 49099, 48935, 48871)

Adopt debian-base as baseimage

**What this PR does / why we need it**:
Based on discussion from - https://github.com/kubernetes/kubernetes/pull/44910/files#r125150263
**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #49169

**Special notes for your reviewer**:

**Release note**:

```NONE
```
pull/6/head
Kubernetes Submit Queue 2017-07-18 21:04:22 -07:00 committed by GitHub
parent 384c1d285d 6f464259b6
commit 94c3c571fc
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/images/resource-consumer/BASEIMAGE
View File

@ -1,4 +1,4 @@
amd64=gcr.io/google-containers/ubuntu-slim-amd64:0.12
arm=gcr.io/google-containers/ubuntu-slim-arm:0.12
arm64=gcr.io/google-containers/ubuntu-slim-arm64:0.12
ppc64le=gcr.io/google-containers/ubuntu-slim-ppc64le:0.12
amd64=gcr.io/google-containers/debian-base-amd64:0.1
arm=gcr.io/google-containers/debian-base-arm:0.1
arm64=gcr.io/google-containers/debian-base-arm64:0.1
ppc64le=gcr.io/google-containers/debian-base-ppc64le:0.1

3
test/images/resource-consumer/Dockerfile
View File

@ -16,8 +16,7 @@ FROM BASEIMAGE
CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
RUN apt-get update && apt-get install -y --no-install-recommends stress && \
rm -rf /var/lib/apt/lists/*
RUN clean-install stress
ADD consumer /consumer
ADD consume-cpu /consume-cpu

2
test/images/resource-consumer/VERSION
View File

@ -1 +1 @@
1.0
1.1