Disable minit logging and create /etc/minit.d in alpine
This commit is contained in:
parent
fe59af29b2
commit
e3c763941a
|
@ -27,7 +27,7 @@ job "base_images" {
|
|||
task "alpine" {
|
||||
driver = "docker"
|
||||
config {
|
||||
image = "danielberteaud/alpine:24.1-3"
|
||||
image = "danielberteaud/alpine:24.1-4"
|
||||
}
|
||||
}
|
||||
task "java11" {
|
||||
|
|
|
@ -15,12 +15,15 @@ RUN set -euxo pipefail &&\
|
|||
FROM alpine:3.19
|
||||
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
|
||||
|
||||
ENV MINIT_LOG_DIR=none
|
||||
|
||||
ADD https://git.lapiole.org/nomad/base_tools.git#master /
|
||||
RUN set -eux &&\
|
||||
apk --no-cache upgrade &&\
|
||||
apk --no-cache add \
|
||||
tini
|
||||
COPY --from=minit /tmp/minit /usr/local/bin/minit
|
||||
COPY root/ /
|
||||
|
||||
ENTRYPOINT ["tini", "--", "/entrypoint.sh"]
|
||||
CMD ["sh"]
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM danielberteaud/alpine:24.1-3
|
||||
FROM danielberteaud/alpine:24.1-4
|
||||
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
|
||||
|
||||
ENV LOGROTATE_CONFIG=/etc/logrotate.conf \
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM danielberteaud/alpine:24.1-3
|
||||
FROM danielberteaud/alpine:24.1-4
|
||||
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
|
||||
|
||||
RUN set -eux &&\
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM danielberteaud/alpine:24.1-3
|
||||
FROM danielberteaud/alpine:24.1-4
|
||||
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
|
||||
|
||||
RUN set -euxo pipefail &&\
|
||||
|
|
|
@ -14,7 +14,7 @@ RUN set -euxo pipefail &&\
|
|||
cd pgcat &&\
|
||||
cargo build --release
|
||||
|
||||
FROM danielberteaud/alpine:24.1-3
|
||||
FROM danielberteaud/alpine:24.1-4
|
||||
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
|
||||
|
||||
ENV PGCAT_CONF_DIR=/etc/pgcat \
|
||||
|
|
|
@ -20,7 +20,7 @@ RUN set -euxo pipefail &&\
|
|||
go build -ldflags " -X github.com/echocat/caretakerd/app.version=v${CARETAKERD_VERSION} -X github.com/echocat/caretakerd/app.revision=$(git rev-parse HEAD) -X github.com/echocat/caretakerd/app.compiled=$(date -Iseconds) -linkmode external -w -extldflags \"-static\"" -o target/caretakerd ./main &&\
|
||||
chmod +x target/caretakerd
|
||||
|
||||
FROM danielberteaud/alpine:24.1-3
|
||||
FROM danielberteaud/alpine:24.1-4
|
||||
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
|
||||
|
||||
ARG PHP_VERSION=83
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
# apk del build-deps
|
||||
|
||||
|
||||
FROM danielberteaud/alpine:24.1-3 AS pgbackrest
|
||||
FROM danielberteaud/alpine:24.1-4 AS pgbackrest
|
||||
|
||||
ARG PGBACKREST_VERSION=2.48
|
||||
|
||||
|
@ -65,7 +65,7 @@ RUN set -eux &&\
|
|||
chmod 755 /usr/local/bin/pgbackrest &&\
|
||||
apk del build-deps
|
||||
|
||||
FROM danielberteaud/alpine:24.1-3
|
||||
FROM danielberteaud/alpine:24.1-4
|
||||
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
|
||||
|
||||
ARG PG_VERSION=15
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM danielberteaud/alpine:24.1-3
|
||||
FROM danielberteaud/alpine:24.1-4
|
||||
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
|
||||
|
||||
RUN set -eux &&\
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM danielberteaud/alpine:24.1-3 AS builder
|
||||
FROM danielberteaud/alpine:24.1-4 AS builder
|
||||
|
||||
ARG WKHTMLTOX_VERSION=0.12.6
|
||||
|
||||
|
@ -165,7 +165,7 @@ RUN set -eu \
|
|||
rm -rf /tmp/* &&\
|
||||
apk del .build-deps
|
||||
|
||||
FROM danielberteaud/alpine:24.1-3
|
||||
FROM danielberteaud/alpine:24.1-4
|
||||
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
|
||||
|
||||
RUN set -eux &&\
|
||||
|
|
|
@ -24,15 +24,15 @@ if ! docker manifest inspect danielberteaud/alma:9.24.1-3 > /dev/null 2>&1; then
|
|||
else
|
||||
echo "Image danielberteaud/alma:9.24.1-3 already available"
|
||||
fi
|
||||
if ! docker manifest inspect danielberteaud/alpine:24.1-3 > /dev/null 2>&1; then
|
||||
echo "Building alpine:24.1-3"
|
||||
if ! docker manifest inspect danielberteaud/alpine:24.1-4 > /dev/null 2>&1; then
|
||||
echo "Building alpine:24.1-4"
|
||||
export BUILDKIT_PROGRESS=plain
|
||||
docker build -t danielberteaud/alpine:24.1-3 -t danielberteaud/alpine:latest output/images/alpine &&\
|
||||
docker push danielberteaud/alpine:24.1-3 &&\
|
||||
docker build -t danielberteaud/alpine:24.1-4 -t danielberteaud/alpine:latest output/images/alpine &&\
|
||||
docker push danielberteaud/alpine:24.1-4 &&\
|
||||
docker push danielberteaud/alpine:latest &&\
|
||||
echo "danielberteaud/alpine:24.1-3 pushed to remote repo"
|
||||
echo "danielberteaud/alpine:24.1-4 pushed to remote repo"
|
||||
else
|
||||
echo "Image danielberteaud/alpine:24.1-3 already available"
|
||||
echo "Image danielberteaud/alpine:24.1-4 already available"
|
||||
fi
|
||||
if ! docker manifest inspect danielberteaud/java:11.24.1-1 > /dev/null 2>&1; then
|
||||
echo "Building java:11.24.1-1"
|
||||
|
|
|
@ -15,12 +15,15 @@ RUN set -euxo pipefail &&\
|
|||
FROM alpine:3.19
|
||||
MAINTAINER [[ .docker.maintainer ]]
|
||||
|
||||
ENV MINIT_LOG_DIR=none
|
||||
|
||||
ADD https://git.lapiole.org/nomad/base_tools.git#master /
|
||||
RUN set -eux &&\
|
||||
apk --no-cache upgrade &&\
|
||||
apk --no-cache add \
|
||||
tini
|
||||
COPY --from=minit /tmp/minit /usr/local/bin/minit
|
||||
COPY root/ /
|
||||
|
||||
ENTRYPOINT ["tini", "--", "/entrypoint.sh"]
|
||||
CMD ["sh"]
|
||||
|
|
|
@ -152,7 +152,7 @@ docker:
|
|||
|
||||
# Latest alpine
|
||||
alpine:
|
||||
image: alpine:24.1-3
|
||||
image: alpine:24.1-4
|
||||
tags:
|
||||
- alpine:latest
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user