Merge remote-tracking branch 'origin/main' into main

Griefed · Griefed · commit 7942f0462cd1 · 2021-06-22T18:36:38.000+02:00
diff --git a/.github/workflows/ci-publish-tag.yml b/.github/workflows/ci-publish-tag.yml
@@ -20,7 +20,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - id: compute_tag
-        uses: craig-day/compute-tag@v11
+        uses: craig-day/compute-tag@v13
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           version_scheme: semantic
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM lsiobase/nginx:3.12
+FROM lsiobase/nginx:3.14
 
 LABEL maintainer="Griefed <griefed@griefed.de>"
 
diff --git a/renovate.json b/renovate.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ],
+  "prConcurrentLimit": 5
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM lsiobase/nginx:3.12`
	`1`	`+FROM lsiobase/nginx:3.14`
`2`	`2`
`3`	`3`	`LABEL maintainer="Griefed <[email protected]>"`
`4`	`4`