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

Rebase dnsmasq images from busybox to debian-base. #296

Merged
merged 1 commit into from
Apr 15, 2019
Merged

Rebase dnsmasq images from busybox to debian-base. #296

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
12 changes: 6 additions & 6 deletions images/dnsmasq/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@ OUTPUT_DIR := _output/$(ARCH)
export DOCKER_CLI_EXPERIMENTAL=enabled

ifeq ($(ARCH),amd64)
BASEIMAGE ?= alpine:3.8
COMPILE_IMAGE := alpine:3.8
BASEIMAGE ?= k8s.gcr.io/debian-base:v1.0.0
COMPILE_IMAGE := k8s.gcr.io/debian-base:v1.0.0
else ifeq ($(ARCH),arm)
BASEIMAGE ?= armhf/busybox:glibc
BASEIMAGE ?= k8s.gcr.io/debian-base-arm:v1.0.0
TRIPLE ?= arm-linux-gnueabihf
QEMUARCH := arm
else ifeq ($(ARCH),arm64)
BASEIMAGE ?= aarch64/busybox:glibc
BASEIMAGE ?= k8s.gcr.io/debian-base-arm64:v1.0.0
TRIPLE ?= aarch64-linux-gnu
QEMUARCH := aarch64
else ifeq ($(ARCH),ppc64le)
BASEIMAGE ?= ppc64le/busybox:glibc
BASEIMAGE ?= k8s.gcr.io/debian-base-ppc64le:v1.0.0
TRIPLE ?= powerpc64le-linux-gnu
QEMUARCH := ppc64le
else ifeq ($(ARCH),s390x)
BASEIMAGE ?=s390x/busybox:glibc
BASEIMAGE ?=k8s.gcr.io/debian-base-s390x:v1.0.0
TRIPLE ?=s390x-linux-gnu
QEMUARCH :=s390x
else
Expand Down