From c7d94b6256ca513980a8b852f41c00451fa29aba Mon Sep 17 00:00:00 2001 From: Matthew Faltys Date: Wed, 5 Jul 2017 14:06:29 -0500 Subject: [PATCH] Add actool pull and full build --- .gitignore | 2 ++ Makefile | 10 ++++++++- deps/manifest.json | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 deps/manifest.json diff --git a/.gitignore b/.gitignore index c159971..2a09a00 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ deps/rootfs.tar.gz deps/stage.tmp filesystem.tmp/ seedpod-layout/ +appc-v0.8.7* +seedpod.aci diff --git a/Makefile b/Makefile index 4b677f2..5e7fa17 100755 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ build_filesystem: tar -czf rootfs.tar.gz * mv filesystem.tmp/rootfs.tar.gz deps/ -aci_build_web: +aci_build_web: pull_actool cd deps/ && \ mkdir -p stage.tmp/theme && \ wget -O stage.tmp/theme.tar.gz $(WEB_THEME) && \ @@ -32,6 +32,8 @@ aci_build_web: cp deps/settings.json seedpod-layout/rootfs/transmission/ cp -R deps/stage.tmp/theme/ seedpod-layout/rootfs/usr/share/transmission/web/ cp deps/run.sh seedpod-layout/rootfs/ + cp deps/manifest.json seedpod-layout/manifest + ./appc-v0.8.7/actool build seedpod-layout seedpod.aci docker_build: cd deps/ && \ @@ -57,9 +59,15 @@ docker_run: -v ~/Downloads/transmission/incomplete:/transmission/incomplete:rw \ $(IMAGE_NAME) +pull_actool: + wget https://github.com/appc/spec/releases/download/v0.8.7/appc-v0.8.7.tar.gz + tar -zxf appc-v0.8.7.tar.gz + clean: rm -rf deps/stage.tmp/ rm -rf seedpod-layout/ + rm -rf appc-v0.8.7* + rm -rf seedpod.aci @if [ -d "filesystem.tmp/" ]; then \ $(OS_PERMS) rm -rf filesystem.tmp; \ fi diff --git a/deps/manifest.json b/deps/manifest.json new file mode 100644 index 0000000..82c609e --- /dev/null +++ b/deps/manifest.json @@ -0,0 +1,51 @@ +{ + "acKind": "ImageManifest", + "acVersion": "0.8.8", + "name": "unixvoid.com/seedpod", + "labels": [ + { + "name": "version", + "value": "latest" + }, + { + "name": "arch", + "value": "amd64" + }, + { + "name": "os", + "value": "linux" + } + ], + "app": { + "user": "root", + "group": "root", + "exec": [ + "/run.sh" + ], + "ports": [ + { + "name": "web", + "protocol": "tcp", + "port": 9091 + } + ], + "mountPoints": [ + { + "name": "downloads", + "path": "/transmission/downloads/", + "readOnly": false + }, + { + "name": "incomplete", + "path": "/transmission/incomplete/", + "readOnly": false + } + ] + }, + "annotations": [ + { + "name": "authors", + "value": "Matthew Faltys " + } + ] +}