From 4f2cbb68543fc85e4717128281ec671c5cdfa7e4 Mon Sep 17 00:00:00 2001 From: Dmitry Verkhoturov Date: Thu, 9 May 2024 11:00:24 +0200 Subject: [PATCH] add and clarify org.opencontainers.image.source comment in Dockerfiles --- .github/workflows/ci.yml | 2 -- Dockerfile | 2 +- Makefile | 2 +- updater/Dockerfile | 3 +++ 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1aa0b407..e55d9c73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,9 +34,7 @@ jobs: go test -v -timeout=100s -covermode=count -coverprofile=$GITHUB_WORKSPACE/profile.cov_tmp ./... cat $GITHUB_WORKSPACE/profile.cov_tmp | grep -v "mocks" | grep -v "_mock" > $GITHUB_WORKSPACE/profile.cov env: - GO111MODULE: on TZ: "America/Chicago" - GOFLAGS: "-mod=vendor" - name: golangci-lint uses: golangci/golangci-lint-action@v6 diff --git a/Dockerfile b/Dockerfile index 2406f0c9..71b5e898 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN \ FROM alpine:3.19 -# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#docker +# enables automatic changelog generation by tools like Dependabot LABEL org.opencontainers.image.source="https://github.com/umputun/tg-spam" ENV TGSPAM_IN_DOCKER=1 RUN apk add --no-cache tzdata diff --git a/Makefile b/Makefile index 5309745e..b6678d31 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ docker: docker build -t umputun/tg-spam . race_test: - go test -race -mod=vendor -timeout=60s -count 1 ./... + go test -race -timeout=60s -count 1 ./... prep_site: cp -fv README.md site/docs/index.md diff --git a/updater/Dockerfile b/updater/Dockerfile index 021da8ae..b91dcede 100644 --- a/updater/Dockerfile +++ b/updater/Dockerfile @@ -1,5 +1,8 @@ FROM ghcr.io/umputun/baseimage/app:latest as base +# enables automatic changelog generation by tools like Dependabot +LABEL org.opencontainers.image.source="https://github.com/umputun/tg-spam" + ENV UPDATER_IN_DOCKER=1 COPY update-git.sh /srv/update-git.sh RUN chmod +x /srv/update-git.sh