github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

tools: rename mkimage-gce to mkimage-gcp

Browse Source 
Also removes `mobyplatform` from the cmdline as this is no longer used

Signed-off-by: Dave Tucker <dt@docker.com>
This commit is contained in:
Dave Tucker 2017-04-06 16:56:20 +01:00
parent 40cc6d8110
commit bf7ab9f04c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/mkimage-gce/Dockerfile → tools/mkimage-gcp/Dockerfile
View File

@ -2,4 +2,4 @@ FROM mobylinux/guestfs:69698aca5bfcb8c4d3a3bbe6d8656be155bf8cd6@sha256:703a7372a
COPY . . COPY . .
ENTRYPOINT [ "/make-gce" ] ENTRYPOINT [ "/make-gcp" ]

4
tools/mkimage-gce/Makefile → tools/mkimage-gcp/Makefile
View File

@ -1,10 +1,10 @@
.PHONY: tag push .PHONY: tag push
IMAGE=mkimage-gce IMAGE=mkimage-gcp
default: push default: push
hash: Dockerfile make-gce hash: Dockerfile make-gcp
tar cf - $^ | docker build --no-cache -t $(IMAGE):build - tar cf - $^ | docker build --no-cache -t $(IMAGE):build -
docker run --entrypoint sh --rm $(IMAGE):build -c "(cat $^; apt list --installed 2>/dev/null) | sha1sum" | sed 's/ .*//' > hash docker run --entrypoint sh --rm $(IMAGE):build -c "(cat $^; apt list --installed 2>/dev/null) | sha1sum" | sed 's/ .*//' > hash

4
tools/mkimage-gce/make-gce → tools/mkimage-gcp/make-gcp
View File

@ -26,8 +26,8 @@ CMDLINE="$*"
# clean up subdirectories # clean up subdirectories
find . -mindepth 1 -maxdepth 1 -type d | xargs rm -rf find . -mindepth 1 -maxdepth 1 -type d | xargs rm -rf
# should be externally provided as GCE specific # should be externally provided as GCP specific
GCE_CONFIG="earlyprintk=ttyS0,115200 console=ttyS0,115200 mobyplatform=gcp vsyscall=emulate page_poison=1" GCP_CONFIG="earlyprintk=ttyS0,115200 console=ttyS0,115200 vsyscall=emulate page_poison=1"
CFG="DEFAULT linux CFG="DEFAULT linux
LABEL linux LABEL linux