Skip to content

Commit

Permalink
Master Merge v0.6.0
Browse files Browse the repository at this point in the history
v0.6.0 Merge
  • Loading branch information
dirtycajunrice authored Jan 17, 2019
2 parents fcc955d + a4bbfb3 commit b14186a
Show file tree
Hide file tree
Showing 21 changed files with 671 additions and 444 deletions.
15 changes: 12 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
sudo: true
dist: xenial
language: python
python:
- 3.6
- 3.7.2
services:
- docker
addons:
apt:
packages:
- docker-ce

script:
- pip install flake8 && flake8 *.py pyouroboros/
Expand All @@ -15,8 +21,11 @@ deploy:
skip_existing: true
on:
branch: master

- provider: script
script: bash ./deploy.sh
script: bash deploy.sh
on:
branch: master
- provider: script
script: bash deploy.sh
on:
branch: develop
255 changes: 255 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
FROM python:3.7-alpine
FROM amd64/python:3.7.2-alpine

LABEL maintainers="dirtycajunrice,circa10a,tkdeviant"

COPY / /app

Expand All @@ -7,4 +9,4 @@ WORKDIR /app
RUN apk add --no-cache tzdata && \
pip install --no-cache-dir .

ENTRYPOINT ["ouroboros"]
ENTRYPOINT ["ouroboros"]
7 changes: 0 additions & 7 deletions Dockerfile-aarch64.rpi

This file was deleted.

7 changes: 0 additions & 7 deletions Dockerfile-arm.rpi

This file was deleted.

14 changes: 14 additions & 0 deletions Dockerfile.arm
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM arm32v6/python:3.7.2-alpine

LABEL maintainers="dirtycajunrice,circa10a,tkdeviant"

COPY / /app

COPY /tmp/qemu-arm-static /usr/bin/qemu-arm-static

WORKDIR /app

RUN apk add --no-cache tzdata && \
pip install --no-cache-dir .

ENTRYPOINT ["ouroboros"]
14 changes: 14 additions & 0 deletions Dockerfile.arm64
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM arm64v8/python:3.7.2-alpine

LABEL maintainers="dirtycajunrice,circa10a,tkdeviant"

COPY / /app

COPY /tmp/qemu-aarch64-static /usr/bin/qemu-aarch64-static

WORKDIR /app

RUN apk add --no-cache tzdata && \
pip install --no-cache-dir .

ENTRYPOINT ["ouroboros"]
13 changes: 13 additions & 0 deletions Dockerfile.armhf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM arm32v7/python:3.7.2-slim

LABEL maintainers="dirtycajunrice,circa10a,tkdeviant"

COPY / /app

COPY /tmp/qemu-arm-static /usr/bin/qemu-arm-static

WORKDIR /app

RUN pip install --no-cache-dir .

ENTRYPOINT ["ouroboros"]
Loading

0 comments on commit b14186a

Please sign in to comment.