From a7f6a8e47db5bebf3fc2b29bb45707990ef33aea Mon Sep 17 00:00:00 2001
From: Dmitry Verkhoturov <paskal.07@gmail.com>
Date: Thu, 9 May 2024 01:52:37 +0200
Subject: [PATCH] add dependabot updates for GitHub Actions, Go modules and
 Dockerfile

---
 .github/dependabot.yml | 22 ++++++++++++++++++++++
 Dockerfile             |  7 +++++--
 Dockerfile.site        |  2 ++
 Makefile               |  2 +-
 4 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..33bc481
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,22 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    groups:
+      "GitHub Actions updates":
+        patterns:
+          - "*"
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    groups:
+      "Go modules updates":
+        dependency-type: "production"
diff --git a/Dockerfile b/Dockerfile
index 16170a6..ee351e5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,6 @@ ARG GIT_BRANCH
 ARG GITHUB_SHA
 ARG CI
 
-ENV GOFLAGS="-mod=vendor"
 ENV CGO_ENABLED=0
 
 ADD . /build
@@ -20,7 +19,11 @@ RUN \
     cd app && go build -o /build/updater -ldflags "-X main.revision=${version} -s -w"
 
 
-FROM ghcr.io/umputun/baseimage/app:v1.7.0
+FROM ghcr.io/umputun/baseimage/app:v1.13.0
+
+# enables automatic changelog generation by tools like Dependabot
+LABEL org.opencontainers.image.source="https://github.com/umputun/updater"
+
 RUN apk add docker openssh-client
 
 RUN \
diff --git a/Dockerfile.site b/Dockerfile.site
index c3a5e50..a24c436 100644
--- a/Dockerfile.site
+++ b/Dockerfile.site
@@ -15,6 +15,8 @@ COPY site/logo.png /build/site/
 
 
 FROM ghcr.io/umputun/reproxy
+# enables automatic changelog generation by tools like Dependabot
+LABEL org.opencontainers.image.source="https://github.com/umputun/updater"
 COPY --from=build /build/site /srv/site
 EXPOSE 8080
 USER app
diff --git a/Makefile b/Makefile
index e3cb56c..61decbd 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ dist:
 	docker rm -f updater.bin
 
 race_test:
-	cd app && go test -race -mod=vendor -timeout=60s -count 1 ./...
+	cd app && go test -race -timeout=60s -count 1 ./...
 
 build: info
 	- cd app && GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags "-X main.revision=$(REV) -s -w" -o ../dist/updater