Skip to content

Commit

Permalink
working around dockerhub limitations...
Browse files Browse the repository at this point in the history
  • Loading branch information
fopina committed Aug 17, 2017
1 parent 5a79f1d commit 703afcd
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ARG CODE_VERSION 3.6
FROM arm32v6/alpine:$CODE_VERSION
# keeping duplicated Dockerfiles for now, until dockerhub upgrades to 1.9
# ARG CODE_VERSION 3.6
FROM arm32v6/alpine:3.6

ENV QEMU_EXECVE 1

Expand Down
7 changes: 7 additions & 0 deletions Dockerfile.3.5
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM arm32v6/alpine:3.5

ENV QEMU_EXECVE 1

COPY . /usr/bin

RUN [ "qemu-arm-static", "/bin/sh", "-c", "ln -s resin-xbuild /usr/bin/cross-build-start; ln -s resin-xbuild /usr/bin/cross-build-end; ln /bin/sh /bin/sh.real" ]
7 changes: 5 additions & 2 deletions hooks/build
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

echo "Build hook running"

docker build --build-arg CODE_VERSION=3.6 -t $DOCKER_REPO:3.6-$CACHE_TAG .
# once dockerhub supports ARG before FROM (upgrade to 1.9)
# docker build --build-arg CODE_VERSION=3.6 -t $DOCKER_REPO:3.6-$CACHE_TAG .
# docker build --build-arg CODE_VERSION=3.5 -t $DOCKER_REPO:3.5-$CACHE_TAG .

docker build --build-arg CODE_VERSION=3.5 -t $DOCKER_REPO:3.5-$CACHE_TAG .
docker build -t $DOCKER_REPO:3.6-$CACHE_TAG -f Dockerfile .
docker build -t $DOCKER_REPO:3.5-$CACHE_TAG -f Dockerfile.3.5 .

0 comments on commit 703afcd

Please sign in to comment.