fix: Docker image

This commit is contained in:
Fernandez Ludovic 2024-12-05 13:29:27 +01:00
parent 48166b4990
commit d18ae5e249
5 changed files with 54 additions and 10 deletions

View File

@ -6,7 +6,7 @@ builds:
ldflags: ldflags:
- -s -w -X github.com/ldez/traefik-certs-dumper/cmd.version={{.Version}} -X github.com/ldez/traefik-certs-dumper/cmd.commit={{.ShortCommit}} -X github.com/ldez/traefik-certs-dumper/cmd.date={{.Date}} - -s -w -X github.com/ldez/traefik-certs-dumper/cmd.version={{.Version}} -X github.com/ldez/traefik-certs-dumper/cmd.commit={{.ShortCommit}} -X github.com/ldez/traefik-certs-dumper/cmd.date={{.Date}}
env: env:
- GO111MODULE=on - CGO_ENABLED=0
goos: goos:
- linux - linux
- darwin - darwin
@ -54,16 +54,22 @@ docker_manifests:
- 'ldez/traefik-certs-dumper:{{ .Tag }}-amd64' - 'ldez/traefik-certs-dumper:{{ .Tag }}-amd64'
- 'ldez/traefik-certs-dumper:{{ .Tag }}-arm64' - 'ldez/traefik-certs-dumper:{{ .Tag }}-arm64'
- 'ldez/traefik-certs-dumper:{{ .Tag }}-armv7' - 'ldez/traefik-certs-dumper:{{ .Tag }}-armv7'
- 'ldez/traefik-certs-dumper:{{ .Tag }}-armv6'
- 'ldez/traefik-certs-dumper:{{ .Tag }}-386'
- name_template: 'ldez/traefik-certs-dumper:latest' - name_template: 'ldez/traefik-certs-dumper:latest'
image_templates: image_templates:
- 'ldez/traefik-certs-dumper:{{ .Tag }}-amd64' - 'ldez/traefik-certs-dumper:{{ .Tag }}-amd64'
- 'ldez/traefik-certs-dumper:{{ .Tag }}-arm64' - 'ldez/traefik-certs-dumper:{{ .Tag }}-arm64'
- 'ldez/traefik-certs-dumper:{{ .Tag }}-armv7' - 'ldez/traefik-certs-dumper:{{ .Tag }}-armv7'
- 'ldez/traefik-certs-dumper:{{ .Tag }}-armv6'
- 'ldez/traefik-certs-dumper:{{ .Tag }}-386'
- name_template: 'ldez/traefik-certs-dumper:v{{ .Major }}.{{ .Minor }}' - name_template: 'ldez/traefik-certs-dumper:v{{ .Major }}.{{ .Minor }}'
image_templates: image_templates:
- 'ldez/traefik-certs-dumper:v{{ .Major }}.{{ .Minor }}-amd64' - 'ldez/traefik-certs-dumper:v{{ .Major }}.{{ .Minor }}-amd64'
- 'ldez/traefik-certs-dumper:v{{ .Major }}.{{ .Minor }}-arm64' - 'ldez/traefik-certs-dumper:v{{ .Major }}.{{ .Minor }}-arm64'
- 'ldez/traefik-certs-dumper:v{{ .Major }}.{{ .Minor }}-armv7' - 'ldez/traefik-certs-dumper:v{{ .Major }}.{{ .Minor }}-armv7'
- 'ldez/traefik-certs-dumper:v{{ .Major }}.{{ .Minor }}-armv6'
- 'ldez/traefik-certs-dumper:v{{ .Major }}.{{ .Minor }}-386'
dockers: dockers:
- use: buildx - use: buildx
@ -133,3 +139,48 @@ dockers:
- '--label=org.opencontainers.image.revision={{.FullCommit}}' - '--label=org.opencontainers.image.revision={{.FullCommit}}'
- '--label=org.opencontainers.image.version={{.Version}}' - '--label=org.opencontainers.image.version={{.Version}}'
- '--platform=linux/arm/v7' - '--platform=linux/arm/v7'
- use: buildx
goos: linux
goarch: arm
goarm: '6'
dockerfile: buildx.Dockerfile
image_templates:
- 'ldez/traefik-certs-dumper:latest-armv6'
- 'ldez/traefik-certs-dumper:latest-arm.v6' # only for compatibility with Seihon
- 'ldez/traefik-certs-dumper:{{ .Tag }}-armv6'
- 'ldez/traefik-certs-dumper:{{ .Tag }}-arm.v6' # only for compatibility with Seihon
- 'ldez/traefik-certs-dumper:v{{ .Major }}.{{ .Minor }}-armv6'
build_flag_templates:
- '--pull'
# https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys
- '--label=org.opencontainers.image.title={{.ProjectName}}'
- '--label=org.opencontainers.image.description=Dump ACME data from Traefik to certificates'
- '--label=org.opencontainers.image.source={{.GitURL}}'
- '--label=org.opencontainers.image.url={{.GitURL}}'
- '--label=org.opencontainers.image.documentation=https://github.com/ldez/traefik-certs-dumper'
- '--label=org.opencontainers.image.created={{.Date}}'
- '--label=org.opencontainers.image.revision={{.FullCommit}}'
- '--label=org.opencontainers.image.version={{.Version}}'
- '--platform=linux/arm/v6'
- use: buildx
goos: linux
goarch: '386'
dockerfile: buildx.Dockerfile
image_templates:
- 'ldez/traefik-certs-dumper:latest-386'
- 'ldez/traefik-certs-dumper:{{ .Tag }}-386'
- 'ldez/traefik-certs-dumper:v{{ .Major }}.{{ .Minor }}-386'
build_flag_templates:
- '--pull'
# https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys
- '--label=org.opencontainers.image.title={{.ProjectName}}'
- '--label=org.opencontainers.image.description=Dump ACME data from Traefik to certificates'
- '--label=org.opencontainers.image.source={{.GitURL}}'
- '--label=org.opencontainers.image.url={{.GitURL}}'
- '--label=org.opencontainers.image.documentation=https://github.com/ldez/traefik-certs-dumper'
- '--label=org.opencontainers.image.created={{.Date}}'
- '--label=org.opencontainers.image.revision={{.FullCommit}}'
- '--label=org.opencontainers.image.version={{.Version}}'
- '--platform=linux/386'

View File

@ -4,6 +4,6 @@ FROM alpine:3
RUN apk --no-cache --no-progress add git ca-certificates tzdata jq \ RUN apk --no-cache --no-progress add git ca-certificates tzdata jq \
&& rm -rf /var/cache/apk/* && rm -rf /var/cache/apk/*
COPY traefik-certs-dumper / COPY traefik-certs-dumper /usr/bin/traefik-certs-dumper
ENTRYPOINT ["/traefik-certs-dumper"] ENTRYPOINT ["/usr/bin/traefik-certs-dumper"]

View File

@ -1,5 +1,3 @@
version: '3.7'
services: services:
traefik: traefik:
image: traefik:v1.7 image: traefik:v1.7
@ -27,7 +25,6 @@ services:
traefik-certs-dumper: traefik-certs-dumper:
image: ldez/traefik-certs-dumper:v2.8.1 image: ldez/traefik-certs-dumper:v2.8.1
entrypoint: sh -c ' entrypoint: sh -c '
apk add jq
; while ! [ -e /data/acme.json ] ; while ! [ -e /data/acme.json ]
|| ! [ `jq ".Certificates | length" /data/acme.json` != 0 ]; do || ! [ `jq ".Certificates | length" /data/acme.json` != 0 ]; do
sleep 1 sleep 1

View File

@ -1,5 +1,3 @@
version: '3.9'
services: services:
traefik: traefik:
@ -27,7 +25,6 @@ services:
traefik-certs-dumper: traefik-certs-dumper:
image: ldez/traefik-certs-dumper:v2.8.3 image: ldez/traefik-certs-dumper:v2.8.3
entrypoint: sh -c ' entrypoint: sh -c '
apk add jq
; while ! [ -e /data/acme.json ] ; while ! [ -e /data/acme.json ]
|| ! [ `jq ".[] | .Certificates | length" /data/acme.json` != 0 ]; do || ! [ `jq ".[] | .Certificates | length" /data/acme.json` != 0 ]; do
sleep 1 sleep 1

View File

@ -146,7 +146,6 @@ services:
image: ldez/traefik-certs-dumper:v2.8.1 image: ldez/traefik-certs-dumper:v2.8.1
container_name: traefik-certs-dumper container_name: traefik-certs-dumper
entrypoint: sh -c ' entrypoint: sh -c '
apk add jq
; while ! [ -e /data/acme.json ] ; while ! [ -e /data/acme.json ]
|| ! [ `jq ".[] | .Certificates | length" /data/acme.json` != 0 ]; do || ! [ `jq ".[] | .Certificates | length" /data/acme.json` != 0 ]; do
sleep 1 sleep 1