diff --git a/.woodpecker.yml b/.woodpecker.yml index 7165763..f06cc29 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -20,4 +20,6 @@ matrix: MAX_MEMORY: - "100mb" ALPINE_VERSION: - - 3.15.0 + - 3.15.4 + REDIS_VERSION: + - 6.2.7 diff --git a/Dockerfile b/Dockerfile index ee8a26f..954eefc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,10 +3,10 @@ ARG ALPINE_VERSION=3.13.6 ARG BASE_IMAGE=sutty/monit FROM ${BASE_IMAGE}:${ALPINE_VERSION} AS build MAINTAINER "f " +ARG REDIS_VERSION=6.2.7 +ARG MAX_MEMORY=100mb -ARG MAX_MEMORY - -RUN apk add --no-cache redis su-exec +RUN apk add --no-cache redis~${REDIS_VERSION} RUN sed -re "/^bind /d" -i /etc/redis.conf RUN sed -re "/^protected-mode /d" -i /etc/redis.conf @@ -23,8 +23,9 @@ ARG ALPINE_VERSION=3.13.6 ARG BASE_IMAGE=sutty/monit FROM ${BASE_IMAGE}:${ALPINE_VERSION} MAINTAINER "f " +ARG REDIS_VERSION=6.2.7 -RUN apk add --no-cache redis +RUN apk add --no-cache redis~${REDIS_VERSION} su-exec COPY --from=build /etc/redis.conf /etc/redis.conf COPY ./monit.conf /etc/monit.d/redis.conf