cross build test/images/serve_hostname and update README

This commit is contained in:
m1093782566 2016-08-23 21:24:42 +08:00
parent c9fda51d77
commit ffc77eff71
3 changed files with 107 additions and 20 deletions

View File

@ -12,9 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM busybox
FROM BASEIMAGE
MAINTAINER Tim Hockin <thockin@google.com>
ADD serve_hostname /serve_hostname
ADD serve_hostname.go /serve_hostname.go
EXPOSE 9376
ENTRYPOINT ["/serve_hostname"]

View File

@ -12,26 +12,90 @@
# See the License for the specific language governing permissions and
# limitations under the License.
all: serve_hostname
# Cross-build the serve_hostname image
#
# Usage:
# [TAG=v1.5] [PREFIX=gcr.io/google_containers] [TEST_REGISTRY=b.gcr.io/k8s_authenticated_test] [ARCH=amd64] [BASEIMAGE=busybox] make all
TAG = v1.4
PREFIX = gcr.io/google_containers
TEST_PREFIX = b.gcr.io/k8s_authenticated_test
.PHONY: all push container clean
serve_hostname: serve_hostname.go
CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' ./serve_hostname.go
TAG ?= v1.5
container: serve_hostname
docker build -t $(PREFIX)/serve_hostname:$(TAG) .
if [ -n "$(TEST_PREFIX)" ]; then \
docker tag -f $(PREFIX)/serve_hostname:$(TAG) $(TEST_PREFIX)/serve_hostname:$(TAG); \
REGISTRY ?= gcr.io/google_containers
TEST_REGISTRY ?= b.gcr.io/k8s_authenticated_test
# Architectures supported: amd64, arm, arm64 and ppc64le
ARCH ?= amd64
ALL_ARCH = amd64 arm arm64 ppc64le
GOARM=6
TEMP_DIR := $(shell mktemp -d)
KUBE_CROSS_IMAGE = gcr.io/google_containers/kube-cross
KUBE_CROSS_VERSION = $(shell cat ../../../build/build-image/cross/VERSION)
BIN = serve_hostname
SRCS = serve_hostname.go
IMAGE = $(REGISTRY)/$(BIN)-$(ARCH)
TEST_IMAGE = $(TEST_REGISTRY)/$(BIN)-$(ARCH)
# Set default base image dynamically for each arch
ifeq ($(ARCH),amd64)
BASEIMAGE?=busybox
endif
ifeq ($(ARCH),arm)
BASEIMAGE?=armel/busybox
endif
ifeq ($(ARCH),arm64)
BASEIMAGE?=aarch64/busybox
endif
ifeq ($(ARCH),ppc64le)
BASEIMAGE?=ppc64le/busybox
endif
# If you want to build AND push all containers, see the 'all-push' rule.
all: all-container
sub-container-%:
$(MAKE) ARCH=$* container
sub-push-%:
$(MAKE) ARCH=$* push
all-container: $(addprefix sub-container-,$(ALL_ARCH))
all-push: $(addprefix sub-push-,$(ALL_ARCH))
build: bin/$(BIN)-$(ARCH)
bin/$(BIN)-$(ARCH): $(SRCS)
# Copy the content in this dir to the temp dir
cp ./* $(TEMP_DIR)
docker run -it -v $(TEMP_DIR):/build \
$(KUBE_CROSS_IMAGE):$(KUBE_CROSS_VERSION) \
/bin/bash -c "\
cd /build && \
CGO_ENABLED=0 GOARM=$(GOARM) GOARCH=$(ARCH) go build -a -installsuffix cgo --ldflags '-w' -o $(BIN) ./$(SRCS)"
container: .container-$(ARCH)
.container-$(ARCH): bin/$(BIN)-$(ARCH)
# Set the base image
cd $(TEMP_DIR) && sed -i.bak 's|BASEIMAGE|$(BASEIMAGE)|g' Dockerfile
docker build -t $(IMAGE):$(TAG) $(TEMP_DIR)
if [ -n "$(TEST_REGISTRY)" ]; then \
docker tag -f $(IMAGE):$(TAG) $(TEST_IMAGE):$(TAG) ;\
fi
push:
gcloud docker push $(PREFIX)/serve_hostname:$(TAG)
if [ -n "$(TEST_PREFIX)" ]; then \
gcloud docker push $(TEST_PREFIX)/serve_hostname:$(TAG); \
push: .push-$(ARCH)
.push-$(ARCH): .container-$(ARCH)
gcloud docker push $(IMAGE):$(TAG)
if [ -n "$(TEST_REGISTRY)" ]; then \
gcloud docker push $(TEST_IMAGE):$(TAG) ;\
fi
clean:
rm -f serve_hostname
rm -rf $(BIN)

View File

@ -1,7 +1,31 @@
serve_hostname
==============
## serve_hostname
Util app to serve your hostname on TCP and/or UDP. Useful for testing.
This is a small util app to serve your hostname on TCP and/or UDP. Useful for testing.
The `serve_hostname` Makefile supports multiple architectures, which means it may cross-compile and build an docker image easily.
Arch-specific busybox images serve as base images.
If you are releasing a new version, please bump the `TAG` value in the `Makefile` before building the images.
## How to release:
```
# Build for linux/amd64 (default)
$ make push
$ make push ARCH=amd64
# ---> gcr.io/google_containers/serve_hostname-amd64:TAG
$ make push ARCH=arm
# ---> gcr.io/google_containers/serve_hostname-arm:TAG
$ make push ARCH=arm64
# ---> gcr.io/google_containers/serve_hostname-arm64:TAG
$ make push ARCH=ppc64le
# ---> gcr.io/google_containers/serve_hostname-ppc64le:TAG
```
Of course, if you don't want to push the images, just run `make container`
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/contrib/for-demos/serve_hostname/README.md?pixel)]()