diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..304be82 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,11 @@ +stages: + - build + +build: + stage: build + image: + name: gcr.io/kaniko-project/executor:debug + entrypoint: [""] + script: + - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json + - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --destination $CI_REGISTRY_IMAGE:latest diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..103cb72 --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,22 @@ +pipeline: + publish: + image: plugins/docker + registry: registry.nulo.in + repo: registry.nulo.in/sutty/CHANGEME + tags: + - ${ALPINE_VERSION} + - latest + build_args: + - ALPINE_VERSION=${ALPINE_VERSION} + - BASE_IMAGE=registry.nulo.in/sutty/monit + username: sutty + secrets: + - docker_password + when: + branch: antifascista + event: push + +matrix: + ALPINE_VERSION: + - 3.13.6 + - 3.14.2 diff --git a/Dockerfile b/Dockerfile index 8706f02..12e76ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ -FROM alpine:3.13.6 AS build -ENV EMAIL monit@sutty.nl +ARG ALPINE_VERSION=3.13.6 +ARG BASE_IMAGE=alpine +ARG EMAIL=monit@sutty.nl +FROM ${BASE_IMAGE}:${ALPINE_VERSION} as build RUN apk add --no-cache tzdata @@ -7,15 +9,11 @@ COPY ./monitrc /etc/monitrc RUN chmod 600 /etc/monitrc RUN sed -re "s/@@EMAIL@@/${EMAIL}/" -i /etc/monitrc -FROM alpine:3.13.6 +FROM ${BASE_IMAGE}:${ALPINE_VERSION} MAINTAINER "f " -# TODO: We don't want to receive lots of email, so we'll change this to -# a pingy instance that will also work as a status site. -ENV EMAIL monit@sutty.nl - # Sutty's repository -RUN echo https://alpine.sutty.nl/alpine/v3.13/sutty >> /etc/apk/repositories +RUN echo https://alpine.sutty.nl/alpine/v${ALPINE_VERSION%\.*}/sutty >> /etc/apk/repositories RUN wget https://alpine.sutty.nl/alpine/sutty.pub -O /etc/apk/keys/alpine@sutty.nl-5ea884cd.rsa.pub # Install monit and remove default config