diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index eccaea2..c6a1534 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,6 +1,4 @@ -# [Choice] Go version: 1, 1.15, 1.14 -ARG VARIANT=1 -FROM mcr.microsoft.com/vscode/devcontainers/go:${VARIANT} +FROM mcr.microsoft.com/vscode/devcontainers/go:1.17 ENV DEVELOPMENT=True # [Option] Install Node.js diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f13a968..accaed5 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,11 +2,6 @@ "name": "Landingpage", "build": { "dockerfile": "Dockerfile", - "args": { - "VARIANT": "1.15", - "INSTALL_NODE": "false", - "NODE_VERSION": "lts/*" - } }, "appPort": [ "8830:8123" ], "postCreateCommand": "go mod download", diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index b993859..904cdb4 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -14,7 +14,7 @@ jobs: uses: golangci/golangci-lint-action@v2.5.2 with: # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. - version: v1.31 + version: v1.43 # Optional: working directory, useful for monorepos # working-directory: somedir diff --git a/Dockerfile b/Dockerfile index 8861657..bedc7d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG BUILD_FROM -FROM golang:1.15-alpine3.13 AS builder +FROM golang:1.17-alpine3.14 AS builder WORKDIR /usr/src/landingpage ARG BUILD_ARCH diff --git a/build.yaml b/build.yaml index 33b9348..d8e11ca 100644 --- a/build.yaml +++ b/build.yaml @@ -1,11 +1,11 @@ image: homeassistant/{machine}-homeassistant shadow_repository: ghcr.io/home-assistant build_from: - aarch64: ghcr.io/home-assistant/aarch64-base:3.13 - armv7: ghcr.io/home-assistant/armv7-base:3.13 - armhf: ghcr.io/home-assistant/armhf-base:3.13 - amd64: ghcr.io/home-assistant/amd64-base:3.13 - i386: ghcr.io/home-assistant/i386-base:3.13 + aarch64: ghcr.io/home-assistant/aarch64-base:3.14 + armv7: ghcr.io/home-assistant/armv7-base:3.14 + armhf: ghcr.io/home-assistant/armhf-base:3.14 + amd64: ghcr.io/home-assistant/amd64-base:3.14 + i386: ghcr.io/home-assistant/i386-base:3.14 codenotary: signer: notary@home-assistant.io base_image: notary@home-assistant.io diff --git a/go.mod b/go.mod index 0ca98ba..0b8352f 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,13 @@ module github.com/home-assistant/landingpage -go 1.15 +go 1.17 require ( github.com/grandcat/zeroconf v1.0.0 github.com/rs/xid v1.3.0 + github.com/cenkalti/backoff v2.2.1+incompatible // indirect + github.com/miekg/dns v1.1.27 // indirect + golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect + golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa // indirect + golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe // indirect )