BREAKING CHANGE: change base container
This commit is contained in:
parent
19868b56cb
commit
9b66b4cbc7
2 changed files with 3 additions and 16 deletions
|
@ -10,7 +10,7 @@ pipeline:
|
||||||
- "latest"
|
- "latest"
|
||||||
build_args:
|
build_args:
|
||||||
- "ALPINE_VERSION=${ALPINE_VERSION}"
|
- "ALPINE_VERSION=${ALPINE_VERSION}"
|
||||||
- "BASE_IMAGE=alpine"
|
- "BASE_IMAGE=gitea.nulo.in/sutty/sutty"
|
||||||
purge: false
|
purge: false
|
||||||
secrets:
|
secrets:
|
||||||
- "DOCKER_PASSWORD"
|
- "DOCKER_PASSWORD"
|
||||||
|
@ -21,5 +21,3 @@ matrix:
|
||||||
ALPINE_VERSION:
|
ALPINE_VERSION:
|
||||||
- "3.18.3"
|
- "3.18.3"
|
||||||
- "3.17.5"
|
- "3.17.5"
|
||||||
- "3.16.7"
|
|
||||||
- "3.15.10"
|
|
||||||
|
|
15
Dockerfile
15
Dockerfile
|
@ -1,30 +1,19 @@
|
||||||
ARG ALPINE_VERSION=3.13.6
|
ARG ALPINE_VERSION=3.18.3
|
||||||
ARG BASE_IMAGE=alpine
|
ARG BASE_IMAGE=gitea.nulo.in/sutty/sutty
|
||||||
FROM ${BASE_IMAGE}:${ALPINE_VERSION} as build
|
FROM ${BASE_IMAGE}:${ALPINE_VERSION} as build
|
||||||
|
|
||||||
RUN apk add --no-cache tzdata
|
|
||||||
|
|
||||||
COPY ./monitrc /etc/monitrc
|
COPY ./monitrc /etc/monitrc
|
||||||
RUN chmod 600 /etc/monitrc
|
RUN chmod 600 /etc/monitrc
|
||||||
|
|
||||||
FROM ${BASE_IMAGE}:${ALPINE_VERSION}
|
FROM ${BASE_IMAGE}:${ALPINE_VERSION}
|
||||||
ARG ALPINE_VERSION
|
|
||||||
MAINTAINER "f <f@sutty.nl>"
|
MAINTAINER "f <f@sutty.nl>"
|
||||||
ENV EMAIL=monit@sutty.nl
|
ENV EMAIL=monit@sutty.nl
|
||||||
ENV EMAIL_FROM=monit@sutty.nl
|
ENV EMAIL_FROM=monit@sutty.nl
|
||||||
ENV MMONIT=mmmonit.athshe.sutty.nl
|
ENV MMONIT=mmmonit.athshe.sutty.nl
|
||||||
ENV CREDENTIALS=mmmonit:mmmonit.athshe.sutty.nl
|
ENV CREDENTIALS=mmmonit:mmmonit.athshe.sutty.nl
|
||||||
|
|
||||||
# Locale
|
|
||||||
ENV LANG="C.UTF-8"
|
|
||||||
|
|
||||||
# Sutty's repository
|
|
||||||
RUN echo ${ALPINE_VERSION} | cut -d . -f 1,2 | xargs -I {} echo https://alpine.sutty.nl/alpine/v{}/sutty | tee -a /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
|
# Install monit and remove default config
|
||||||
RUN apk add --no-cache tini monit knsupdate
|
RUN apk add --no-cache tini monit knsupdate
|
||||||
COPY --from=build /usr/share/zoneinfo/UTC /etc/localtime
|
|
||||||
|
|
||||||
# Create directories
|
# Create directories
|
||||||
RUN install -dm 2750 -o root -g root /etc/monit.d
|
RUN install -dm 2750 -o root -g root /etc/monit.d
|
||||||
|
|
Loading…
Reference in a new issue