Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rebase container images from alpine to debian-base. #294

Merged
merged 1 commit into from
Apr 10, 2019
Merged

Rebase container images from alpine to debian-base. #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.node-cache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM debian:stable-slim
FROM k8s.gcr.io/debian-base:v1.0.0
RUN apt-get update && apt-get install -y \
iproute2 \
iptables \
Expand Down
10 changes: 5 additions & 5 deletions rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ SRC_DIRS := cmd pkg
ALL_ARCH := amd64 arm arm64 ppc64le s390x
# Set default base image dynamically for each arch
ifeq ($(ARCH),amd64)
BASEIMAGE?=alpine:3.8
BASEIMAGE?=k8s.gcr.io/debian-base:v1.0.0
endif
ifeq ($(ARCH),arm)
BASEIMAGE?=arm32v6/alpine:3.8
BASEIMAGE?=k8s.gcr.io/debian-base-arm:v1.0.0
endif
ifeq ($(ARCH),arm64)
BASEIMAGE?=arm64v8/alpine:3.8
BASEIMAGE?=k8s.gcr.io/debian-base-arm64:v1.0.0
endif
ifeq ($(ARCH),ppc64le)
BASEIMAGE?=ppc64le/alpine:3.8
BASEIMAGE?=k8s.gcr.io/debian-base-ppc64le:v1.0.0
endif
ifeq ($(ARCH),s390x)
BASEIMAGE?=s390x/alpine:3.8
BASEIMAGE?=k8s.gcr.io/debian-base-s390x:v1.0.0
endif

# These rules MUST be expanded at reference time (hence '=') as BINARY
Expand Down