Compare commits

..

14 Commits

Author SHA1 Message Date
IamTheFij b5e99939fb Back to alpine. This is dumb
continuous-integration/drone/push Build is failing Details
2021-01-20 18:21:40 -08:00
IamTheFij 01dc2dd149 Drop back cloudflare version
continuous-integration/drone/push Build is failing Details
2021-01-20 18:14:44 -08:00
IamTheFij 4702310823 Try to go back to py3.8
continuous-integration/drone/push Build is failing Details
2021-01-20 17:56:36 -08:00
IamTheFij aef73188f2 Add setuptools back
continuous-integration/drone/push Build was killed Details
2021-01-20 17:50:17 -08:00
IamTheFij 9a8445e6ec switch to slim python
continuous-integration/drone/push Build was killed Details
2021-01-20 17:42:27 -08:00
IamTheFij a752c67dad update setuptools
continuous-integration/drone/push Build is failing Details
2021-01-20 17:32:46 -08:00
IamTheFij 2c9b26a283 Switch pip method
continuous-integration/drone/push Build was killed Details
2021-01-20 17:27:33 -08:00
IamTheFij ff2d50b6e8 Fix drone builds on tags 2021-01-20 17:03:07 -08:00
IamTheFij d66c11cc00 Bump Cloudflare version to 2.8.15
continuous-integration/drone/tag Build is passing Details
continuous-integration/drone/push Build is failing Details
2021-01-20 16:38:51 -08:00
IamTheFij fdb3c744b0 Fix permissions on script
Was this broken for months?
2021-01-20 16:38:51 -08:00
IamTheFij d9b20c4759 Add repo links to README.md
continuous-integration/drone/push Build is passing Details
Should make it easier to finds the original source.
2020-02-22 07:54:19 -08:00
IamTheFij 2b41676824 Copy all qemu files because drone is being weird
continuous-integration/drone/push Build is passing Details
Change qemu version
2020-01-30 11:57:28 -08:00
IamTheFij 176feef895 Slightly reduce image size by removing pip cache 2020-01-30 11:09:32 -08:00
IamTheFij 3402b91b04 Contain entire build in Dockerfile
continuous-integration/drone/push Build is failing Details
continuous-integration/drone/tag Build is passing Details
Rather than pulling and storing the py file, having start script
and fetching of qemu files here, everything can just be done in the
Dockerfile.
2020-01-23 17:49:12 -08:00
3 changed files with 42 additions and 33 deletions

View File

@ -1,6 +1,15 @@
---
kind: pipeline
name: linux-amd64
trigger:
event:
- push
- tag
refs:
- refs/heads/master
- refs/tags/v*
steps:
- name: build
@ -13,17 +22,19 @@ steps:
from_secret: docker_username
password:
from_secret: docker_password
when:
branch:
- master
event:
- push
- tag
---
kind: pipeline
name: linux-arm
trigger:
event:
- push
- tag
refs:
- refs/heads/master
- refs/tags/v*
steps:
- name: build
@ -38,18 +49,20 @@ steps:
from_secret: docker_password
build_args:
- ARCH=arm
- REPO=arm32v6
when:
branch:
- master
event:
- push
- tag
- REPO=arm32v7
---
kind: pipeline
name: linux-arm64
trigger:
event:
- push
- tag
refs:
- refs/heads/master
- refs/tags/v*
steps:
- name: build
@ -65,12 +78,6 @@ steps:
build_args:
- ARCH=aarch64
- REPO=arm64v8
when:
branch:
- master
event:
- push
- tag
---
kind: pipeline
@ -81,6 +88,14 @@ depends_on:
- linux-arm
- linux-arm64
trigger:
event:
- push
- tag
refs:
- refs/heads/master
- refs/tags/v*
steps:
- name: publish manifest
image: plugins/manifest
@ -92,10 +107,3 @@ steps:
from_secret: docker_username
password:
from_secret: docker_password
when:
branch:
- master
event:
- push
- tag

View File

@ -1,14 +1,15 @@
ARG REPO=library
FROM multiarch/qemu-user-static:4.1.0-1 as qemu-user-static
FROM multiarch/qemu-user-static:4.2.0-2 as qemu-user-static
# Make sure a dummy x86_64 file exists so that the copy command doesn't error
RUN touch /usr/bin/qemu-x86_64-fake
# RUN touch /usr/bin/qemu-x86_64-fake
FROM ${REPO}/python:3-alpine
FROM ${REPO}/python:3.8-alpine
# Copy mutliarch file to run builds on x86_64
ARG ARCH=x86_64
COPY --from=qemu-user-static /usr/bin/qemu-${ARCH}-* /usr/bin/
COPY --from=qemu-user-static /usr/bin/qemu-* /usr/bin/
# COPY --from=qemu-user-static /usr/bin/qemu-${ARCH}-* /usr/bin/
RUN mkdir -p /src
WORKDIR /src
@ -16,9 +17,9 @@ WORKDIR /src
# Get Cloudflare example script
ENV CF_VERSION=2.6.0
ADD https://raw.githubusercontent.com/cloudflare/python-cloudflare/$CF_VERSION/examples/example_update_dynamic_dns.py ./update_ddns.py
RUN chmod +x ./update_ddns.py
RUN chmod +rx ./update_ddns.py
RUN pip install cloudflare==$CF_VERSION
RUN python -m pip install --no-cache-dir cloudflare==$CF_VERSION
ENV DOMAIN=""

View File

@ -14,7 +14,7 @@ build:
.PHONY: cross-build-arm
cross-build-arm:
docker build --build-arg REPO=arm32v6 --build-arg ARCH=arm . -t ${DOCKER_TAG}-linux-arm
docker build --build-arg REPO=arm32v7 --build-arg ARCH=arm . -t ${DOCKER_TAG}-linux-arm
.PHONY: cross-build-arm64
cross-build-arm64: