Merge branch 'antifascista' of https://gitea.nulo.in/Sutty/containers-monit into antifascista
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
This commit is contained in:
commit
b1303ef0b4
2 changed files with 4 additions and 5 deletions
|
@ -12,7 +12,7 @@ pipeline:
|
||||||
- "RUBY_VERSION=${RUBY_VERSION}"
|
- "RUBY_VERSION=${RUBY_VERSION}"
|
||||||
- "RUBY_PATCH=${RUBY_PATCH}"
|
- "RUBY_PATCH=${RUBY_PATCH}"
|
||||||
- "ALPINE_VERSION=${ALPINE_VERSION}"
|
- "ALPINE_VERSION=${ALPINE_VERSION}"
|
||||||
- "BASE_IMAGE=gitea.nulo.in/sutty/monit"
|
- "BASE_IMAGE=gitea.nulo.in/sutty/sutty"
|
||||||
purge: false
|
purge: false
|
||||||
secrets:
|
secrets:
|
||||||
- "DOCKER_PASSWORD"
|
- "DOCKER_PASSWORD"
|
||||||
|
@ -21,7 +21,7 @@ pipeline:
|
||||||
event: "push"
|
event: "push"
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- ALPINE_VERSION: "3.18.3"
|
- ALPINE_VERSION: "3.18.4"
|
||||||
RUBY_VERSION: "3.2"
|
RUBY_VERSION: "3.2"
|
||||||
RUBY_PATCH: "2"
|
RUBY_PATCH: "2"
|
||||||
- ALPINE_VERSION: "3.17.5"
|
- ALPINE_VERSION: "3.17.5"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
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
|
||||||
ARG RUBY_VERSION=2.7
|
ARG RUBY_VERSION=2.7
|
||||||
ARG RUBY_PATCH=5
|
ARG RUBY_PATCH=5
|
||||||
|
@ -11,7 +11,6 @@ COPY ./rubygems-platform-musl.patch /tmp/
|
||||||
RUN cd /usr/lib/ruby/${RUBY_VERSION}.0 && patch -Np 0 -i /tmp/rubygems-platform-musl.patch || true
|
RUN cd /usr/lib/ruby/${RUBY_VERSION}.0 && patch -Np 0 -i /tmp/rubygems-platform-musl.patch || true
|
||||||
|
|
||||||
FROM ${BASE_IMAGE}:${ALPINE_VERSION}
|
FROM ${BASE_IMAGE}:${ALPINE_VERSION}
|
||||||
ARG ALPINE_VERSION
|
|
||||||
MAINTAINER "f <f@sutty.nl>"
|
MAINTAINER "f <f@sutty.nl>"
|
||||||
ARG RUBY_VERSION
|
ARG RUBY_VERSION
|
||||||
ARG RUBY_PATCH
|
ARG RUBY_PATCH
|
||||||
|
|
Loading…
Reference in a new issue