Skip to content

Commit

Permalink
#6 - maintain RPI + multiarch
Browse files Browse the repository at this point in the history
  • Loading branch information
jaymoulin committed Dec 4, 2017
1 parent e26a802 commit f5dcc0d
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 4 deletions.
9 changes: 7 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION ?= 0.3.0
CACHE ?= --no-cache=1
FULLVERSION ?= ${VERSION}
archs = amd64 arm32v6 arm64v8 i386
archs ?= amd64 arm32v6 arm64v8 i386

.PHONY: all build publish latest
all: build publish latest
Expand All @@ -17,14 +17,19 @@ build:
else \
cat Dockerfile.arm >> Dockerfile; \
cat Dockerfile.common >> Dockerfile; \
docker build -t jaymoulin/plex:${VERSION}-$(arch) ${CACHE} .;\
docker build -t jaymoulin/rpi-plex:${VERSION}-$(arch) ${CACHE} .;\
fi; \
)
publish:
docker push jaymoulin/plex
docker push jaymoulin/rpi-plex
cat manifest.yml | sed "s/\$$VERSION/${VERSION}/g" > manifest.yaml
cat manifest.yaml | sed "s/\$$FULLVERSION/${FULLVERSION}/g" > manifest2.yaml
mv manifest2.yaml manifest.yaml
manifest-tool push from-spec manifest.yaml
cat manifest.rpi.yml | sed "s/\$$VERSION/${VERSION}/g" > manifest.yaml
cat manifest.yaml | sed "s/\$$FULLVERSION/${FULLVERSION}/g" > manifest2.yaml
mv manifest2.yaml manifest.yaml
manifest-tool push from-spec manifest.yaml
latest: build
FULLVERSION=latest VERSION=${VERSION} make publish
14 changes: 14 additions & 0 deletions manifest.rpi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
image: jaymoulin/rpi-plex:$FULLVERSION
manifests:
-
image: jaymoulin/rpi-plex:$VERSION-arm32v6
platform:
architecture: arm
variant: v6
os: linux
-
image: jaymoulin/rpi-plex:$VERSION-arm64v8
platform:
architecture: arm
variant: v8
os: linux
4 changes: 2 additions & 2 deletions manifest.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
image: jaymoulin/plex:$FULLVERSION
manifests:
-
image: jaymoulin/plex:$VERSION-arm32v6
image: jaymoulin/rpi-plex:$VERSION-arm32v6
platform:
architecture: arm
variant: v6
os: linux
-
image: jaymoulin/plex:$VERSION-arm64v8
image: jaymoulin/rpi-plex:$VERSION-arm64v8
platform:
architecture: arm
variant: v8
Expand Down

0 comments on commit f5dcc0d

Please sign in to comment.