Skip to content

Commit

Permalink
group GitHub actions updates into a single PR, clarify Dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
paskal committed May 9, 2024
1 parent 927ffb7 commit 2e83ef7
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
6 changes: 5 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ updates:
directory: "/"
schedule:
interval: "monthly"
groups:
"GitHub Actions updates":
patterns:
- "*"
- package-ecosystem: "docker"
directory: "/base.alpine"
schedule:
Expand All @@ -20,4 +24,4 @@ updates:
- package-ecosystem: "docker"
directory: "/build.go"
schedule:
interval: "monthly"
interval: "monthly"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ FROM umputun/baseimage:buildgo as build
WORKDIR /build
ADD . /build

RUN go test -mod=vendor ./...
RUN go test ./...
RUN golangci-lint run --out-format=tab --tests=false ./...

RUN \
revison=$(/script/git-rev.sh) && \
echo "revision=${revison}" && \
go build -mod=vendor -o app -ldflags "-X main.revision=$revison -s -w" .
go build -o app -ldflags "-X main.revision=$revison -s -w" .


FROM umputun/baseimage:app
Expand Down
2 changes: 1 addition & 1 deletion base.alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM alpine:3.19

LABEL org.opencontainers.image.authors="Umputun <[email protected]>"
# 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/baseimage"

ENV \
Expand Down
2 changes: 1 addition & 1 deletion base.scratch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN \
FROM scratch

LABEL org.opencontainers.image.authors="Umputun <[email protected]>"
# 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/baseimage"

ENV TZ=America/Chicago
Expand Down
2 changes: 1 addition & 1 deletion build.go/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.22-alpine

LABEL org.opencontainers.image.authors="Umputun <[email protected]>"
# 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/baseimage"

ENV \
Expand Down

0 comments on commit 2e83ef7

Please sign in to comment.