Skip to content

Commit

Permalink
Update to Alpine 3.19/Go 1.22/CoreDNS 1.8.7
Browse files Browse the repository at this point in the history
  • Loading branch information
agners committed Mar 11, 2024
1 parent 84f0de6 commit 40309ce
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG BUILD_FROM

FROM golang:1.15-alpine3.13 AS builder
FROM golang:1.22-alpine3.19 AS builder

WORKDIR /usr/src
ARG BUILD_ARCH
Expand All @@ -27,6 +27,7 @@ RUN \
&& sed -i "/kubernetes:kubernetes/d" plugin.cfg \
&& sed -i "/etcd:etcd/d" plugin.cfg \
&& sed -i "/grpc:grpc/d" plugin.cfg \
&& go mod tidy \
&& go generate \
&& \
if [ "${BUILD_ARCH}" = "armhf" ]; then \
Expand Down
12 changes: 6 additions & 6 deletions build.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
image: homeassistant/{arch}-hassio-dns
shadow_repository: ghcr.io/home-assistant
build_from:
aarch64: ghcr.io/home-assistant/aarch64-base:3.14
armhf: ghcr.io/home-assistant/armhf-base:3.14
armv7: ghcr.io/home-assistant/armv7-base:3.14
amd64: ghcr.io/home-assistant/amd64-base:3.14
i386: ghcr.io/home-assistant/i386-base:3.14
aarch64: ghcr.io/home-assistant/aarch64-base:3.19
armhf: ghcr.io/home-assistant/armhf-base:3.19
armv7: ghcr.io/home-assistant/armv7-base:3.19
amd64: ghcr.io/home-assistant/amd64-base:3.19
i386: ghcr.io/home-assistant/i386-base:3.19
codenotary:
signer: [email protected]
base_image: [email protected]
Expand All @@ -19,4 +19,4 @@ labels:
org.opencontainers.image.documentation: https://www.home-assistant.io/docs/
org.opencontainers.image.licenses: Apache License 2.0
args:
COREDNS_VERSION: 1.8.4
COREDNS_VERSION: 1.8.7
2 changes: 1 addition & 1 deletion plugins/fallback/fallback.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
package fallback

import (
"golang.org/x/net/context"
"context"

"github.com/coredns/coredns/plugin"
"github.com/coredns/coredns/plugin/pkg/nonwriter"
Expand Down
3 changes: 1 addition & 2 deletions plugins/fallback/fallback_test.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package fallback

import (
"context"
"testing"

"golang.org/x/net/context"

"github.com/coredns/coredns/plugin/pkg/dnstest"
"github.com/coredns/coredns/plugin/test"

Expand Down
2 changes: 1 addition & 1 deletion plugins/mdns/mdns.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package mdns

import (
"context"
"net"
"strings"
"syscall"
Expand All @@ -11,7 +12,6 @@ import (
"github.com/coredns/coredns/request"

"github.com/miekg/dns"
"golang.org/x/net/context"
)

var log = clog.NewWithPlugin("mdns")
Expand Down

0 comments on commit 40309ce

Please sign in to comment.