Skip to content

Commit

Permalink
chore(deps): bump golang from 1.22-bookworm to 1.23-bookworm in the d…
Browse files Browse the repository at this point in the history
…ocker group (#42)

* chore(deps): bump golang in the docker group

Bumps the docker group with 1 update: golang.


Updates `golang` from 1.22-bookworm to 1.23-bookworm

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  dependency-group: docker
...

Signed-off-by: dependabot[bot] <support@github.com>

* update to go 1.23

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: TheDen <deniskhoshaba@gmail.com>
  • Loading branch information
dependabot[bot] and TheDen authored Aug 16, 2024
1 parent 4e79543 commit 3ff91e3
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup-go/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ runs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: "1.22"
go-version: "1.23"
4 changes: 2 additions & 2 deletions Dockerfile.template
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Test Dockerfile for anchor
FROM golang:1.22-bookworm as builder
FROM golang:1.23-bookworm as builder

# anchor ignore=curl,wget
# hadolint ignore=DL3008
Expand All @@ -8,7 +8,7 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get clean

FROM golang:1.22-bookworm
FROM golang:1.23-bookworm
# hadolint ignore=DL3008
RUN apt-get update \
&& apt-get install --no-install-recommends -y curl wget \
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Given this `Dockerfile`

```dockerfile
# Comments are preserved
FROM golang:1.22-bookworm as builder
FROM golang:1.23-bookworm as builder

RUN apt-get update \
&& apt-get install --no-install-recommends -y curl wget \
Expand All @@ -80,7 +80,7 @@ Running `anchor` will generate the following `Dockerfile`

```dockerfile
# Comments are preserved
FROM golang:1.22-bookworm@sha256:5c56bd47228dd572d8a82971cf1f946cd8bb1862a8ec6dc9f3d387cc94136976 as builder
FROM golang:1.23-bookworm@sha256:31dc846dd1bcca84d2fa231bcd16c09ff271bcc1a5ae2c48ff10f13b039688f3 as builder

RUN apt-get update \
&& dpkg --add-architecture arm64 && apt-get update && \
Expand Down Expand Up @@ -148,7 +148,7 @@ It is possible to tell anchor to ignore images and packages in the Dockerfile st
```dockerfile
# ignore this statement
# anchor ignore
FROM golang:1.22-bookworm as builder
FROM golang:1.23-bookworm as builder

# ignore this statement
# anchor ignore
Expand All @@ -158,8 +158,8 @@ RUN apt-get update \
&& apt-get clean

# explicitly tell anchor to ignore this image
# anchor ignore=golang:1.22-bookworm
FROM golang:1.22-bookworm
# anchor ignore=golang:1.23-bookworm
FROM golang:1.23-bookworm

# explicitly tell anchor to ignore the curl package
# anchor ignore=curl
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/songstitch/anchor

go 1.22.1
go 1.23

require (
github.com/fatih/color v1.17.0
Expand Down
8 changes: 4 additions & 4 deletions pkg/anchor/docker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ RUN dpkg --add-architecture %s && apt-get update && apt-get update \

func TestImageIgnore(t *testing.T) {
file := `# hadolint ignore=DL3008
# anchor ignore=golang:1.22-bookworm
FROM golang:1.22-bookworm as builder
# anchor ignore=golang:1.23-bookworm
FROM golang:1.23-bookworm as builder
`

input := strings.NewReader(file)
Expand All @@ -176,7 +176,7 @@ FROM golang:1.22-bookworm as builder
if err != nil {
t.Errorf("Expected no error but got %v", err)
}
if image != "golang:1.22-bookworm" {
t.Errorf("Expected golang:1.22-bookworm but got %v", image)
if image != "golang:1.23-bookworm" {
t.Errorf("Expected golang:1.23-bookworm but got %v", image)
}
}
12 changes: 6 additions & 6 deletions pkg/anchor/parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ func TestParser(t *testing.T) {
"Simple multiline node",
`# Test Dockerfile for anchor
FROM golang:1.22-bookworm as builder`,
FROM golang:1.23-bookworm as builder`,
Nodes{
{
CommandType: CommandFrom,
Command: "FROM golang:1.22-bookworm as builder",
Command: "FROM golang:1.23-bookworm as builder",
Entries: []Entry{
{
Type: EntryComment,
Expand All @@ -65,7 +65,7 @@ FROM golang:1.22-bookworm as builder`,
},
{
Type: EntryCommand,
Value: "FROM golang:1.22-bookworm as builder\n",
Value: "FROM golang:1.23-bookworm as builder\n",
Beginning: true,
},
},
Expand All @@ -74,7 +74,7 @@ FROM golang:1.22-bookworm as builder`,
},
{
"Multiple nodes",
`FROM golang:1.22-bookworm
`FROM golang:1.23-bookworm
# hadolint ignore=DL3008
RUN apt-get update \
&& apt-get install \
Expand All @@ -86,11 +86,11 @@ RUN apt-get update \
Nodes{
{
CommandType: CommandFrom,
Command: "FROM golang:1.22-bookworm",
Command: "FROM golang:1.23-bookworm",
Entries: []Entry{
{
Type: EntryCommand,
Value: "FROM golang:1.22-bookworm\n",
Value: "FROM golang:1.23-bookworm\n",
Beginning: true,
},
},
Expand Down

0 comments on commit 3ff91e3

Please sign in to comment.