diff --git a/.dockerignore b/.dockerignore index 02937308..b969110d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,3 +6,4 @@ tests/ *.sh .coveragerc .travis.yml +doc/ diff --git a/Dockerfile b/Dockerfile index 80568523..a322364d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,4 +3,4 @@ FROM python:3.6-alpine COPY . /app WORKDIR /app RUN pip install --no-cache-dir . -ENTRYPOINT ["ouroboros"] +ENTRYPOINT ["ouroboros"] \ No newline at end of file diff --git a/Dockerfile.rpi b/Dockerfile.rpi new file mode 100644 index 00000000..7dd2087c --- /dev/null +++ b/Dockerfile.rpi @@ -0,0 +1,6 @@ +FROM resin/raspberry-pi-alpine-python:3.6-slim-20181218 + +COPY . /app +WORKDIR /app +RUN pip install --no-cache-dir . +ENTRYPOINT ["ouroboros"] \ No newline at end of file diff --git a/README.md b/README.md index 0432669e..e5699639 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ A python-based alternative to [watchtower](https://github.com/v2tec/watchtower) ## Table of Contents - [Overview](#overview) +- [Changelog](doc/CHANGELOG.md) - [Usage](#usage) - [Docker](#docker) - [Pip](#pip) @@ -48,12 +49,20 @@ Ouroboros will monitor all running docker containers or those you specify and up Ouroboros is deployed via docker image like so: +**x86** ```bash docker run -d --name ouroboros \ -v /var/run/docker.sock:/var/run/docker.sock \ circa10a/ouroboros ``` +**ARM/RPI** +```bash +docker run -d --name ouroboros \ + -v /var/run/docker.sock:/var/run/docker.sock \ + circa10a/ouroboros:latest-rpi +``` + or via `docker-compose`: ```yaml diff --git a/deploy.sh b/deploy.sh index fe5b2d69..5929da3b 100755 --- a/deploy.sh +++ b/deploy.sh @@ -7,13 +7,24 @@ PROJECT='ouroboros' NAMESPACE=${USER}/${PROJECT} # Auth echo $docker_password | docker login -u=$USER --password-stdin -# Latest + +# Latest x86 docker build -t $NAMESPACE:latest . docker push $NAMESPACE:latest -# Versioned +# Versioned x86 docker tag $NAMESPACE:latest $NAMESPACE:$VERSION docker push $NAMESPACE:$VERSION +# prepare qemu for ARM builds +docker run --rm --privileged multiarch/qemu-user-static:register --reset + +# Latest ARM +docker build -t $NAMESPACE:latest-rpi -f ./Dockerfile.rpi +docker push $NAMESPACE:latest-rpi +# Versioned ARM +docker tag $NAMESPACE:latest-rpi $NAMESPACE:$VERSION-rpi +docker push $NAMESPACE:$VERSION-rpi + # Git tags git remote set-url origin https://$USER:$github_api_key@github.com/$USER/$PROJECT.git git tag $VERSION diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md new file mode 100644 index 00000000..7e667d02 --- /dev/null +++ b/doc/CHANGELOG.md @@ -0,0 +1,6 @@ +# Changelog + +## 0.3.4 + +Features: + - ARM/Rpi Docker image \ No newline at end of file diff --git a/setup.py b/setup.py index 83464867..b566557d 100644 --- a/setup.py +++ b/setup.py @@ -13,14 +13,14 @@ def read_reqs(requirements): setup( name='ouroboros-cli', - version='0.3.3', + version='0.3.4', description='Automatically update running docker containers', long_description=readme(), long_description_content_type='text/markdown', url='https://github.com/circa10a/ouroboros', license='MIT', classifiers=['Programming Language :: Python'], - packages=find_packages(exclude=['tests']), + packages=find_packages(exclude=['doc', 'tests']), scripts=['ouroboros/ouroboros'], install_requires=read_reqs(requirements='./requirements.txt'), tests_require=read_reqs(requirements='./requirements-dev.txt'),