diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index cb1de7e..0acd071 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -35,25 +35,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build amd64 - uses: docker/build-push-action@v5 - with: - load: true - tags: ${{ matrix.repo }}:${{ matrix.version }}${{ matrix.variant }} - platforms: linux/amd64 - build-args: | - TARGET_ARCH=amd64 - - - name: Build arm64 - uses: docker/build-push-action@v5 - with: - load: true - tags: ${{ matrix.repo }}:${{ matrix.version }}${{ matrix.variant }} - platforms: linux/arm64 - build-args: | - TARGET_ARCH=arm64 - - - name: Push images + name: Build and push image uses: docker/build-push-action@v5 with: push: true diff --git a/Dockerfile b/Dockerfile index 10a001e..5febd45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,18 @@ ARG DEBIAN_VERSION=bullseye-slim -FROM debian:${DEBIAN_VERSION} +FROM golang:1.9-alpine as confd ARG CONFD_VERSION=0.16.0 -ARG TARGET_ARCH=amd64 -ADD https://github.com/kelseyhightower/confd/releases/download/v${CONFD_VERSION}/confd-${CONFD_VERSION}-linux-${TARGET_ARCH} /usr/local/bin/confd +ADD https://github.com/kelseyhightower/confd/archive/v${CONFD_VERSION}.tar.gz /tmp/ +RUN apk add --no-cache \ + bzip2 \ + make && \ + mkdir -p /go/src/github.com/kelseyhightower/confd && \ + cd /go/src/github.com/kelseyhightower/confd && \ + tar --strip-components=1 -zxf /tmp/v${CONFD_VERSION}.tar.gz && \ + go install github.com/kelseyhightower/confd && \ + rm -rf /tmp/v${CONFD_VERSION}.tar.gz + +FROM debian:${DEBIAN_VERSION} +COPY --from=confd /go/bin/confd /usr/local/bin/confd RUN mkdir -p /start.d \ && printf '#!/bin/bash\nset -e\n/usr/local/bin/confd -onetime -backend env\nrun-parts -v /start.d\nexec ${@}\n' > /entrypoint.sh \ && mkdir -p /etc/confd/conf.d /etc/confd/templates \