nomad/common
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure CGO is disabled when building minit

Browse Source
This commit is contained in:
Daniel Berteaud 2024-01-19 13:40:24 +01:00
parent c2ba7a7760
commit 0d1fda575b
14 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/base_images.nomad.hcl
View File

@ -27,7 +27,7 @@ job "base_images" {
task "alpine" {
driver = "docker"
config {
image = "danielberteaud/alpine:24.1-5"
image = "danielberteaud/alpine:24.1-6"
}
}
task "java11" {

2
example/images/alpine/Dockerfile
View File

@ -10,7 +10,7 @@ RUN set -euxo pipefail &&\
curl -sSL https://github.com/yankeguo/minit/archive/refs/tags/v${MINIT_VERSION}.tar.gz | \
tar xvz &&\
cd minit-${MINIT_VERSION} &&\
go build -ldflags="-s -w" -o /tmp/minit
CGO_ENABLED=0 go build -ldflags="-s -w" -o /tmp/minit
FROM alpine:3.19
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>

2
example/images/java/Dockerfile
View File

@ -19,7 +19,7 @@ RUN set -exo 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-5 /usr/local/bin/minit /usr/local/bin/minit
COPY --from=danielberteaud/alpine:24.1-6 /usr/local/bin/minit /usr/local/bin/minit
ENTRYPOINT ["tini", "--", "/entrypoint.sh"]
CMD ["sh"]

2
example/images/logrotate/Dockerfile
View File

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

2
example/images/mariadb-client/Dockerfile
View File

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

2
example/images/pgbouncer/Dockerfile
View File

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

2
example/images/pgcat/Dockerfile
View File

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

2
example/images/php/Dockerfile
View File

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

4
example/images/postgres/Dockerfile.alpine
View File

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

2
example/images/sqlite/Dockerfile
View File

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

4
example/images/wkhtmltopdf/Dockerfile
View File

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

12
example/prep.d/build_base_images.sh
View File

@ -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-5 > /dev/null 2>&1; then
echo "Building alpine:24.1-5"
if ! docker manifest inspect danielberteaud/alpine:24.1-6 > /dev/null 2>&1; then
echo "Building alpine:24.1-6"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/alpine:24.1-5 -t danielberteaud/alpine:latest output/images/alpine &&\
docker push danielberteaud/alpine:24.1-5 &&\
docker build -t danielberteaud/alpine:24.1-6 -t danielberteaud/alpine:latest output/images/alpine &&\
docker push danielberteaud/alpine:24.1-6 &&\
docker push danielberteaud/alpine:latest &&\
echo "danielberteaud/alpine:24.1-5 pushed to remote repo"
echo "danielberteaud/alpine:24.1-6 pushed to remote repo"
else
echo "Image danielberteaud/alpine:24.1-5 already available"
echo "Image danielberteaud/alpine:24.1-6 already available"
fi
if ! docker manifest inspect danielberteaud/java:11.24.1-2 > /dev/null 2>&1; then
echo "Building java:11.24.1-2"

2
images/alpine/Dockerfile
View File

@ -10,7 +10,7 @@ RUN set -euxo pipefail &&\
curl -sSL https://github.com/yankeguo/minit/archive/refs/tags/v${MINIT_VERSION}.tar.gz | \
tar xvz &&\
cd minit-${MINIT_VERSION} &&\
go build -ldflags="-s -w" -o /tmp/minit
CGO_ENABLED=0 go build -ldflags="-s -w" -o /tmp/minit
FROM alpine:3.19
MAINTAINER [[ .docker.maintainer ]]

2
variables.yml
View File

@ -153,7 +153,7 @@ docker:
# Latest alpine
alpine:
image: alpine:24.1-5
image: alpine:24.1-6
tags:
- alpine:latest