From 7802ea52c71e6acca49f5f739569ce1d9f9a007d Mon Sep 17 00:00:00 2001 From: kev Date: Mon, 22 Feb 2016 19:48:35 +0800 Subject: [PATCH] fix alpine-arm --- README.md | 2 +- alpine-arm/Makefile | 3 ++- alpine-arm/README.md | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0f332e6..d36b223 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ dockerfiles - [x] influxdb - [x] iptables - [x] jenkins -- [x] jenkins-arm +- [x] jenkins-arm :beetle: - [x] joomla - [x] mantisbt - [x] monit diff --git a/alpine-arm/Makefile b/alpine-arm/Makefile index fd41c30..5e981a1 100644 --- a/alpine-arm/Makefile +++ b/alpine-arm/Makefile @@ -10,7 +10,8 @@ rootfs.tar.xz: mkimage-alpine.sh mkimage-alpine.sh: curl -sSLO https://github.com/docker/docker/raw/master/contrib/mkimage-alpine.sh - sed -i -r -e '/docker import/s@alpine:\$$REL@vimagick/alpine-arm:$${REL#v}@' \ + sed -i -r -e '/trap /s@@chmod 0755 $$TMP $$ROOTFS; &@' \ + -e '/docker import/s@alpine:\$$REL@vimagick/alpine-arm:$${REL#v}@' \ -e '/docker (tag|run)/d' mkimage-alpine.sh chmod +x mkimage-alpine.sh diff --git a/alpine-arm/README.md b/alpine-arm/README.md index bf75c85..5e8ba38 100644 --- a/alpine-arm/README.md +++ b/alpine-arm/README.md @@ -18,7 +18,8 @@ rootfs.tar.xz: mkimage-alpine.sh mkimage-alpine.sh: curl -sSLO https://github.com/docker/docker/raw/master/contrib/mkimage-alpine.sh - sed -i -r -e '/docker import/s@alpine:\$$REL@vimagick/alpine-arm:$${REL#v}@' \ + sed -i -r -e '/trap /s@@chmod 0755 $$TMP $$ROOTFS; &@' \ + -e '/docker import/s@alpine:\$$REL@vimagick/alpine-arm:$${REL#v}@' \ -e '/docker (tag|run)/d' mkimage-alpine.sh chmod +x mkimage-alpine.sh @@ -38,6 +39,8 @@ clean: ## Make Images ``` +$ docker login + $ make RELEASE=edge $ make test RELEASE=edge $ make push RELEASE=edge