Replace ready unit with a simple placeholder

This commit is contained in:
Daniel Berteaud 2024-01-20 00:23:10 +01:00
parent 4c92d8c118
commit 7c8a44dc2e
23 changed files with 39 additions and 49 deletions

View File

@ -15,19 +15,19 @@ job "base_images" {
task "alma8" {
driver = "docker"
config {
image = "danielberteaud/alma:8.24.1-5"
image = "danielberteaud/alma:8.24.1-6"
}
}
task "alma9" {
driver = "docker"
config {
image = "danielberteaud/alma:9.24.1-5"
image = "danielberteaud/alma:9.24.1-6"
}
}
task "alpine" {
driver = "docker"
config {
image = "danielberteaud/alpine:24.1-7"
image = "danielberteaud/alpine:24.1-8"
}
}
task "java11" {

View File

@ -24,7 +24,7 @@ RUN set -x &&\
busybox --install &&\
rm -rf /var/cache/yum/* /var/log/yum/* /var/lib/dnf/history*
COPY --from=danielberteaud/alpine:24.1-7 /usr/local/bin/minit /usr/local/bin/minit
COPY --from=danielberteaud/alpine:24.1-8 /usr/local/bin/minit /usr/local/bin/minit
COPY root/ /
ENTRYPOINT ["tini", "--", "/entrypoint.sh"]

View File

@ -1,5 +0,0 @@
---
kind: once
name: ready-notifier
command: ["echo", "minit has started"]

View File

@ -23,7 +23,7 @@ RUN set -euxo pipefail &&\
mkdir /jmx_exporter &&\
curl -sSL https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/${JMX_EXPORTER_VERSION}/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar -o /jmx_exporter/jmx_prometheus_javaagent.jar
COPY root/ /
COPY --from=danielberteaud/alpine:24.1-7 /usr/local/bin/minit /usr/local/bin/minit
COPY --from=danielberteaud/alpine:24.1-8 /usr/local/bin/minit /usr/local/bin/minit
ENTRYPOINT ["tini", "--", "/entrypoint.sh"]
CMD ["sh"]

View File

@ -1,4 +1,4 @@
FROM danielberteaud/alpine:24.1-7
FROM danielberteaud/alpine:24.1-8
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ENV LOGROTATE_CONFIG=/etc/logrotate.conf \

View File

@ -1,4 +1,4 @@
FROM danielberteaud/alpine:24.1-7
FROM danielberteaud/alpine:24.1-8
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
RUN set -eux &&\

View File

@ -1,4 +1,4 @@
FROM danielberteaud/alma:8.24.1-5
FROM danielberteaud/alma:8.24.1-6
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ARG MONGO_MAJOR=3.6

View File

@ -1,4 +1,4 @@
FROM danielberteaud/alpine:24.1-7
FROM danielberteaud/alpine:24.1-8
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
RUN set -euxo pipefail &&\

View File

@ -14,7 +14,7 @@ RUN set -euxo pipefail &&\
cd pgcat &&\
cargo build --release
FROM danielberteaud/alpine:24.1-7
FROM danielberteaud/alpine:24.1-8
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ENV PGCAT_CONF_DIR=/etc/pgcat \

View File

@ -1,4 +1,4 @@
FROM danielberteaud/alpine:24.1-7
FROM danielberteaud/alpine:24.1-8
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ARG PHP_VERSION=83

View File

@ -1,4 +1,4 @@
FROM danielberteaud/alma:9.24.1-5 AS pgvectors
FROM danielberteaud/alma:9.24.1-6 AS pgvectors
ARG PG_VERSION=15 \
PGVECTORS_VERSION=0.1.11
@ -28,7 +28,7 @@ RUN set -eux &&\
cargo pgrx init --pg${PG_VERSION}=/usr/pgsql-${PG_VERSION}/bin/pg_config &&\
cargo pgrx install --release
FROM danielberteaud/alma:9.24.1-5
FROM danielberteaud/alma:9.24.1-6
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ARG PG_VERSION

View File

@ -33,7 +33,7 @@
# apk del build-deps
FROM danielberteaud/alpine:24.1-7 AS pgbackrest
FROM danielberteaud/alpine:24.1-8 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-7
FROM danielberteaud/alpine:24.1-8
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ARG PG_VERSION=15

View File

@ -1,4 +1,4 @@
FROM danielberteaud/alpine:24.1-7
FROM danielberteaud/alpine:24.1-8
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
RUN set -eux &&\

View File

@ -1,4 +1,4 @@
FROM danielberteaud/alpine:24.1-7 AS builder
FROM danielberteaud/alpine:24.1-8 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-7
FROM danielberteaud/alpine:24.1-8
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
RUN set -eux &&\

View File

@ -2,37 +2,37 @@
# vim: syntax=sh
set -euo pipefail
if ! docker manifest inspect danielberteaud/alma:8.24.1-5 > /dev/null 2>&1; then
echo "Building alma:8.24.1-5"
if ! docker manifest inspect danielberteaud/alma:8.24.1-6 > /dev/null 2>&1; then
echo "Building alma:8.24.1-6"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/alma:8.24.1-5 -t danielberteaud/alma8:latest -t danielberteaud/alma:8 --build-arg=ALMA=8 output/images/alma &&\
docker push danielberteaud/alma:8.24.1-5 &&\
docker build -t danielberteaud/alma:8.24.1-6 -t danielberteaud/alma8:latest -t danielberteaud/alma:8 --build-arg=ALMA=8 output/images/alma &&\
docker push danielberteaud/alma:8.24.1-6 &&\
docker push danielberteaud/alma8:latest &&\
docker push danielberteaud/alma:8 &&\
echo "danielberteaud/alma:8.24.1-5 pushed to remote repo"
echo "danielberteaud/alma:8.24.1-6 pushed to remote repo"
else
echo "Image danielberteaud/alma:8.24.1-5 already available"
echo "Image danielberteaud/alma:8.24.1-6 already available"
fi
if ! docker manifest inspect danielberteaud/alma:9.24.1-5 > /dev/null 2>&1; then
echo "Building alma:9.24.1-5"
if ! docker manifest inspect danielberteaud/alma:9.24.1-6 > /dev/null 2>&1; then
echo "Building alma:9.24.1-6"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/alma:9.24.1-5 -t danielberteaud/alma9:latest -t danielberteaud/alma:9 --build-arg=ALMA=9 output/images/alma &&\
docker push danielberteaud/alma:9.24.1-5 &&\
docker build -t danielberteaud/alma:9.24.1-6 -t danielberteaud/alma9:latest -t danielberteaud/alma:9 --build-arg=ALMA=9 output/images/alma &&\
docker push danielberteaud/alma:9.24.1-6 &&\
docker push danielberteaud/alma9:latest &&\
docker push danielberteaud/alma:9 &&\
echo "danielberteaud/alma:9.24.1-5 pushed to remote repo"
echo "danielberteaud/alma:9.24.1-6 pushed to remote repo"
else
echo "Image danielberteaud/alma:9.24.1-5 already available"
echo "Image danielberteaud/alma:9.24.1-6 already available"
fi
if ! docker manifest inspect danielberteaud/alpine:24.1-7 > /dev/null 2>&1; then
echo "Building alpine:24.1-7"
if ! docker manifest inspect danielberteaud/alpine:24.1-8 > /dev/null 2>&1; then
echo "Building alpine:24.1-8"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/alpine:24.1-7 -t danielberteaud/alpine:latest output/images/alpine &&\
docker push danielberteaud/alpine:24.1-7 &&\
docker build -t danielberteaud/alpine:24.1-8 -t danielberteaud/alpine:latest output/images/alpine &&\
docker push danielberteaud/alpine:24.1-8 &&\
docker push danielberteaud/alpine:latest &&\
echo "danielberteaud/alpine:24.1-7 pushed to remote repo"
echo "danielberteaud/alpine:24.1-8 pushed to remote repo"
else
echo "Image danielberteaud/alpine:24.1-7 already available"
echo "Image danielberteaud/alpine:24.1-8 already available"
fi
if ! docker manifest inspect danielberteaud/java:11.24.1-3 > /dev/null 2>&1; then
echo "Building java:11.24.1-3"

View File

@ -1,5 +0,0 @@
---
kind: once
name: ready-notifier
command: ["echo", "minit has started"]

View File

@ -135,7 +135,7 @@ docker:
# AlmaLinux 8
alma8:
image: alma:8.24.1-5
image: alma:8.24.1-6
build_args:
ALMA: 8
tags:
@ -144,7 +144,7 @@ docker:
# AlmaLinux 9
alma9:
image: alma:9.24.1-5
image: alma:9.24.1-6
build_args:
ALMA: 9
tags:
@ -153,7 +153,7 @@ docker:
# Latest alpine
alpine:
image: alpine:24.1-7
image: alpine:24.1-8
tags:
- alpine:latest