diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3c21a57 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.Dockerfile +*.yaml +qemu-*-static diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 627c419..4129368 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,7 @@ How to Contribute This project welcomes your contribution. There are several ways to help out: -* Create an [issue](https://github.com/jaymoulin/docker-rpi-google-musicmanager/issues/) on GitHub, +* Create an [issue](https://github.com/jaymoulin/docker-google-musicmanager/issues/) on GitHub, if you have found a bug or have an idea for a feature * Write test cases for open bug issues * Write patches for open bug/feature issues @@ -11,7 +11,7 @@ if you have found a bug or have an idea for a feature Issues ------ -* Submit an [issue](https://github.com/jaymoulin/docker-rpi-google-musicmanager/issues/) +* Submit an [issue](https://github.com/jaymoulin/docker-google-musicmanager/issues/) * Make sure it does not already exist. * Clearly describe the issue including steps to reproduce, when it is a bug. * Make sure you note the version you use. @@ -19,6 +19,6 @@ Issues Additional Resources -------------------- -* [Existing issues](https://github.com/jaymoulin/docker-rpi-google-musicmanager/issues/) +* [Existing issues](https://github.com/jaymoulin/docker-google-musicmanager/issues/) * [General GitHub documentation](https://help.github.com/) * [GitHub pull request documentation](https://help.github.com/send-pull-requests/) diff --git a/Dockerfile b/Dockerfile index dfb796d..5b61967 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,10 @@ -FROM jaymoulin/rpi-python:alpine +FROM python:alpine3.6 as builder -MAINTAINER Jay MOULIN +COPY qemu-*-static /usr/bin/ + +FROM builder + +LABEL maintainer="Jay MOULIN " ENV REMOVE=1 ENV UPLOADER_ID=false diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..594783d --- /dev/null +++ b/Makefile @@ -0,0 +1,20 @@ +VERSION ?= 0.6.0 +FULLVERSION ?= ${VERSION} +archs = s390x arm32v7 amd64 i386 arm64v8 arm32v6 + +.PHONY: all build publish latest +all: build publish latest +build: + cp /usr/bin/qemu-*-static . + $(foreach arch,$(archs), \ + cat Dockerfile | sed "s/FROM python:alpine/FROM ${arch}\/python:alpine/g" > .Dockerfile; \ + docker build -t jaymoulin/google-musicmanager:${VERSION}-$(arch) -f .Dockerfile .;\ + ) +publish: + docker push jaymoulin/google-musicmanager + 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 +latest: build + FULLVERSION=latest VERSION=${VERSION} make publish diff --git a/README.md b/README.md index ce131cf..170376f 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,14 @@ ![logo](logo.png) -Raspberry PI - Google Music Manager - Docker Image -================================================== +Google Music Manager - Docker Image (Multiarch) +=============================================== -[![latest release](https://img.shields.io/github/release/jaymoulin/docker-rpi-google-musicmanager.svg "latest release")](http://github.com/jaymoulin/docker-rpi-google-musicmanager/releases) -[![Docker Pulls](https://img.shields.io/docker/pulls/jaymoulin/rpi-google-musicmanager.svg)](https://hub.docker.com/r/jaymoulin/rpi-google-musicmanager/) -[![Docker stars](https://img.shields.io/docker/stars/jaymoulin/rpi-google-musicmanager.svg)](https://hub.docker.com/r/jaymoulin/rpi-google-musicmanager/) +[![latest release](https://img.shields.io/github/release/jaymoulin/docker-google-musicmanager.svg "latest release")](http://github.com/jaymoulin/docker-google-musicmanager/releases) +[![Docker Pulls](https://img.shields.io/docker/pulls/jaymoulin/google-musicmanager.svg)](https://hub.docker.com/r/jaymoulin/google-musicmanager/) +[![Docker stars](https://img.shields.io/docker/stars/jaymoulin/google-musicmanager.svg)](https://hub.docker.com/r/jaymoulin/google-musicmanager/) [![Bitcoin donation](https://github.com/jaymoulin/jaymoulin.github.io/raw/master/btc.png "Bitcoin donation")](https://m.freewallet.org/id/374ad82e/btc) [![Litecoin donation](https://github.com/jaymoulin/jaymoulin.github.io/raw/master/ltc.png "Litecoin donation")](https://m.freewallet.org/id/374ad82e/ltc) [![PayPal donation](https://github.com/jaymoulin/jaymoulin.github.io/raw/master/ppl.png "PayPal donation")](https://www.paypal.me/jaymoulin) -[![Beerpay donation](https://beerpay.io/jaymoulin/docker-rpi-google-musicmanager/badge.svg "Beerpay donation")](https://beerpay.io/jaymoulin/docker-rpi-google-musicmanager) This image allows you to download and upload your Google Music Library to/from a selected folder. This image is based on [Google MusicManager](https://github.com/jaymoulin/google-music-manager) @@ -18,7 +17,7 @@ Installation --- ``` -docker run -d --restart=always -v /path/to/your/upload/library:/media/library/upload -v /path/to/your/download/library:/media/library/download --name googlemusicmanager jaymoulin/rpi-google-musicmanager +docker run -d --restart=always -v /path/to/your/upload/library:/media/library/upload -v /path/to/your/download/library:/media/library/download --name googlemusicmanager jaymoulin/google-musicmanager ``` You must define your path to your upload library in a volume to `/media/library/upload` @@ -69,7 +68,7 @@ docker restart googlemusicmanager Appendixes --- -### Install RaspberryPi Docker +### Install Docker If you don't have Docker installed yet, you can do it easily in one line using this command diff --git a/logo.png b/logo.png index abbbb70..4a9aa2c 100644 Binary files a/logo.png and b/logo.png differ diff --git a/manifest.yml b/manifest.yml new file mode 100644 index 0000000..14cabe5 --- /dev/null +++ b/manifest.yml @@ -0,0 +1,29 @@ +image: jaymoulin/google-musicmanager:$FULLVERSION +manifests: + - + image: jaymoulin/google-musicmanager:$VERSION-arm32v6 + platform: + architecture: arm + variant: v6 + os: linux + - + image: jaymoulin/google-musicmanager:$VERSION-arm64v8 + platform: + architecture: arm + variant: v8 + os: linux + - + image: jaymoulin/google-musicmanager:$VERSION-amd64 + platform: + architecture: arm64 + os: linux + - + image: jaymoulin/google-musicmanager:$VERSION-i386 + platform: + architecture: 386 + os: linux + - + image: jaymoulin/google-musicmanager:$VERSION-s390x + platform: + architecture: s390x + os: linux