diff --git a/.github/actions/setup-go/action.yaml b/.github/actions/setup-go/action.yaml index dc12ed7..db13a20 100644 --- a/.github/actions/setup-go/action.yaml +++ b/.github/actions/setup-go/action.yaml @@ -6,4 +6,4 @@ runs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" diff --git a/Dockerfile.template b/Dockerfile.template index c03f3e1..fab0b30 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -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 @@ -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 \ diff --git a/README.md b/README.md index 6024f4a..849aa77 100644 --- a/README.md +++ b/README.md @@ -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 \ @@ -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 && \ @@ -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 @@ -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 diff --git a/go.mod b/go.mod index 8575b6f..ca3fb3b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/songstitch/anchor -go 1.22.1 +go 1.23 require ( github.com/fatih/color v1.17.0 diff --git a/pkg/anchor/docker_test.go b/pkg/anchor/docker_test.go index afe4e66..f62d9f8 100644 --- a/pkg/anchor/docker_test.go +++ b/pkg/anchor/docker_test.go @@ -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) @@ -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) } } diff --git a/pkg/anchor/parser_test.go b/pkg/anchor/parser_test.go index 4d49852..75a9a54 100644 --- a/pkg/anchor/parser_test.go +++ b/pkg/anchor/parser_test.go @@ -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, @@ -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, }, }, @@ -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 \ @@ -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, }, },