Skip to content

Commit dae0a2d

Browse files
committed
Merge master and resolve Go version conflict
Resolved conflict by: - Keeping Go 1.25 from master (latest version) - Keeping SHELL directive from our branch (hadolint fix) This combines the latest Go version update with our Dockerfile improvements.
2 parents 9df0e1e + af2d31f commit dae0a2d

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

.github/dependabot.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
version: 2
2+
updates:
3+
# Keep GitHub Actions up to date
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "weekly"
8+
commit-message:
9+
prefix: "ci"
10+
include: "scope"
11+
12+
# Keep Docker base images up to date
13+
- package-ecosystem: "docker"
14+
directory: "/"
15+
schedule:
16+
interval: "weekly"
17+
commit-message:
18+
prefix: "docker"
19+
include: "scope"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
###
44
### Medusa build process
55
###
6-
FROM golang:1.23 AS medusa
6+
FROM golang:1.25 AS medusa
77
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
88

99
WORKDIR /src

0 commit comments

Comments
 (0)