Skip to content

Commit

Permalink
Alpine 3.14 / Golang 1.17 (#50)
Browse files Browse the repository at this point in the history
* Alpine 3.14 / Golang 1.17

* update lint

* Fix load
  • Loading branch information
pvizeli authored Nov 25, 2021
1 parent 0887f61 commit 75cc90e
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 16 deletions.
4 changes: 1 addition & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 0 additions & 5 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
uses: golangci/[email protected]
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
Expand Down
2 changes: 1 addition & 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.17-alpine3.14 AS builder

WORKDIR /usr/src/landingpage
ARG BUILD_ARCH
Expand Down
10 changes: 5 additions & 5 deletions build.yaml
Original file line number Diff line number Diff line change
@@ -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: [email protected]
base_image: [email protected]
Expand Down
7 changes: 6 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
)

0 comments on commit 75cc90e

Please sign in to comment.