From 3052602c43e5c6fbece29d2d31bb0e2d22058f29 Mon Sep 17 00:00:00 2001 From: f Date: Mon, 7 Mar 2022 11:43:14 -0300 Subject: [PATCH] build in two steps --- .woodpecker.yml | 2 +- Dockerfile | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index ceb5737..40aeff4 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -2,7 +2,7 @@ pipeline: publish: image: plugins/docker registry: registry.nulo.in - repo: registry.nulo.in/sutty/CHANGEME + repo: registry.nulo.in/sutty/redis tags: - ${ALPINE_VERSION} - latest diff --git a/Dockerfile b/Dockerfile index f8fc94b..ccf0733 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,10 @@ ARG ALPINE_VERSION=3.13.6 ARG BASE_IMAGE=sutty/monit -FROM ${BASE_IMAGE}:${ALPINE_VERSION} +FROM ${BASE_IMAGE}:${ALPINE_VERSION} AS build MAINTAINER "f " RUN apk add --no-cache redis -COPY ./monit.conf /etc/monit.d/redis.conf - RUN sed -re "/^bind /d" -i /etc/redis.conf RUN sed -re "/^protected-mode /d" -i /etc/redis.conf RUN sed -re "/^logfile /d" -i /etc/redis.conf @@ -18,5 +16,15 @@ RUN echo "protected-mode no" >> /etc/redis.conf RUN echo "maxmemory-policy allkeys-lfu" >> /etc/redis.conf RUN echo "maxmemory 100mb" >> /etc/redis.conf +ARG ALPINE_VERSION=3.13.6 +ARG BASE_IMAGE=sutty/monit +FROM ${BASE_IMAGE}:${ALPINE_VERSION} +MAINTAINER "f " + +RUN apk add --no-cache redis + +COPY --from=build /etc/redis.conf /etc/redis.conf +COPY ./monit.conf /etc/monit.d/redis.conf + EXPOSE 6379 VOLUME "/var/lib/redis"