Multi architecture docker (#110)

* initial commit; * update docker * update docker config * update docker config * update docker config * update docker config * update docker config * update docker config * update docker config * update docker config * initial commit; * update docker * update docker config * update docker config * update docker config * update docker config * update docker config * update docker config * update docker config * update docker config * add multi arch docker ima support
pyouroboros · Jan 16, 2019 · 1327eb7 · 1327eb7
1 parent eeef9bc
commit 1327eb7
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 34 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,13 @@
+sudo: true
 language: python
 python:
   - 3.6
 services:
   - docker
+addons:
+  apt:
+    packages:
+      - docker-ce
 
 script:
   - pip install flake8 && flake8 *.py pyouroboros/

diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,7 @@
 FROM python:3.7-alpine
 
-COPY / /app
-
 WORKDIR /app
-
+COPY . .
 RUN apk add --no-cache tzdata && \
     pip install --no-cache-dir .
-
 ENTRYPOINT ["ouroboros"]
diff --git a/Dockerfile-aarch64.rpi → Dockerfile-arm32v7.rpi b/Dockerfile-aarch64.rpi → Dockerfile-arm32v7.rpi
@@ -1,4 +1,4 @@
-FROM resin/generic-aarch64-alpine-python:3-slim
+FROM balenalib/raspberry-pi-alpine-python:3.7
 
 COPY . /app
 WORKDIR /app

diff --git a/Dockerfile-arm.rpi → Dockerfile-arm64v8.rpi b/Dockerfile-arm.rpi → Dockerfile-arm64v8.rpi
@@ -1,4 +1,4 @@
-FROM resin/raspberry-pi-alpine-python:3-slim
+FROM balenalib/aarch64-alpine-python:3.7
 
 COPY . /app
 WORKDIR /app

diff --git a/README.md b/README.md
@@ -32,26 +32,13 @@ More detailed usage and configuration can be found on [the wiki](https://github.
 
 Ouroboros is deployed via docker image like so:
 
-**x86**
 ```bash
 docker run -d --name ouroboros \
   -v /var/run/docker.sock:/var/run/docker.sock \
   pyouroboros/ouroboros
 ```
 
-**Rpi 3 B+**
-```bash
-docker run -d --name ouroboros \
-  -v /var/run/docker.sock:/var/run/docker.sock \
-  pyouroboros/ouroboros:latest-aarch64-rpi
-```
-
-**All other Rpi's**
-```bash
-docker run -d --name ouroboros \
-  -v /var/run/docker.sock:/var/run/docker.sock \
-  pyouroboros/ouroboros:latest-arm-rpi
-```
+> This is image is compatible for amd64, arm32v7, and arm64v8 CPU architectures (regular systems and Raspberry Pi's)
 
 or via `docker-compose`:
 

diff --git a/deploy.sh b/deploy.sh
@@ -1,34 +1,49 @@
-#!/usr/bin/env bash -e
-VERSION=$(grep -i version ./setup.py | awk -F= '{gsub("\047",""); gsub(",",""); print $2}')
+#!/usr/bin/env bash
+VERSION="$(grep -i version ./pyouroboros/__init__.py | awk -F= '{gsub("\047",""); gsub(",",""); print $2}')"
 
 # Docker
 GITHUB_USER='pyouroboros-bot'
 DOCKER_USER='pyouroborosbot'
 PROJECT='ouroboros'
 NAMESPACE="pyouroboros/${PROJECT}"
+
+# Docker experimental config
+echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
+[ -d ~/.docker ] || mkdir ~/.docker
+[ -f ~/.docker/config.json ] || touch ~/.docker/config.json
+echo '{"experimental":"enabled"}' | sudo tee ~/.docker/config.json
+sudo service docker restart
+
 # Auth
 echo $DOCKER_PASSWORD | docker login -u="$DOCKER_USER" --password-stdin
 
-# Latest x86
-docker build -t $NAMESPACE:latest . && \
-docker push $NAMESPACE:latest && \
-# Versioned x86
-docker tag $NAMESPACE:latest $NAMESPACE:$VERSION && \
-docker push $NAMESPACE:$VERSION
+# Latest x64
+docker build -t "${NAMESPACE}:latest" . && \
+docker push "${NAMESPACE}:latest" && \
+# Versioned x64
+docker tag "${NAMESPACE}:latest" "${NAMESPACE}:${VERSION}" && \
+docker push "${NAMESPACE}:${VERSION}" && \
+# x64 Arch
+docker tag "${NAMESPACE}:latest" "${NAMESPACE}:latest-amd64" && \
+docker push "${NAMESPACE}:latest-amd64"
 
-# prepare qemu for ARM builds
+# Prepare qemu for ARM builds
 docker run --rm --privileged multiarch/qemu-user-static:register --reset
 
+# ARM images
 for i in $(ls *.rpi); do
-  ARCH="$(echo ${i} | cut -d- -f2 | cut -d. -f1)"
+  arch="$(echo ${i} | cut -d- -f2 | cut -d. -f1)"
   # Latest
-  docker build -f "./Dockerfile-${ARCH}.rpi" -t "${NAMESPACE}:latest-${ARCH}-rpi" . && \
-  docker push "${NAMESPACE}:latest-${ARCH}-rpi" && \
+  docker build -f "./Dockerfile-${arch}.rpi" -t "${NAMESPACE}:latest-${arch}-rpi" . && \
+  docker push "${NAMESPACE}:latest-${arch}-rpi" && \
   # Versioned
-  docker tag "${NAMESPACE}:latest-${ARCH}-rpi" "${NAMESPACE}:${VERSION}-${ARCH}-rpi" && \
-  docker push "${NAMESPACE}:${VERSION}-${ARCH}-rpi"
+  docker tag "${NAMESPACE}:latest-${arch}-rpi" "${NAMESPACE}:${VERSION}-${arch}-rpi" && \
+  docker push "${NAMESPACE}:${VERSION}-${arch}-rpi"
 done
 
+wget -O manifest-tool https://github.com/estesp/manifest-tool/releases/download/v0.9.0/manifest-tool-linux-amd64 && \
+chmod +x manifest-tool && \
+./manifest-tool --username "$USER" --password "$docker_password" push from-spec "${USER}-${PROJECT}.yaml"
 # Git tags
 git remote set-url origin "https://${GITHUB_USER}:${GITHUB_API_KEY}@github.com/${NAMESPACE}.git" && \
 git tag "${VERSION}" && \

diff --git a/dev-environment.yml b/dev-environment.yml
@@ -5,4 +5,5 @@ dependencies:
       - schedule
       - prometheus_client
       - requests
+      - influxdb
       - flake8
diff --git a/environment.yml b/environment.yml
@@ -5,3 +5,4 @@ dependencies:
       - schedule
       - prometheus_client
       - requests
+      - influxdb
diff --git a/pyouroboros-ouroboros.yaml b/pyouroboros-ouroboros.yaml
@@ -0,0 +1,19 @@
+image: pyouroboros/ouroboros:latest
+manifests:
+  -
+    image: pyouroboros/ouroboros:latest-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  -
+    image: pyouroboros/ouroboros:latest-arm32v7-rpi
+    platform:
+      architecture: arm
+      variant: v7
+      os: linux
+  -
+    image: pyouroboros/ouroboros:latest-arm64v8-rpi
+    platform:
+      architecture: arm64
+      variant: v8
+      os: linux