Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.203.0/containers/go/.devcontainer/base.Dockerfile

# [Choice] Go version (use -bullseye variants on local arm64/Apple Silicon): 1, 1.16, 1.17, 1-bullseye, 1.16-bullseye, 1.17-bullseye, 1-buster, 1.16-buster, 1.17-buster
ARG VARIANT="1.17-bullseye"
FROM mcr.microsoft.com/vscode/devcontainers/go:0-${VARIANT}
ARG VARIANT="1.18"
FROM mcr.microsoft.com/vscode/devcontainers/go:${VARIANT}

# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
ARG NODE_VERSION="none"
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// Update the VARIANT arg to pick a version of Go: 1, 1.16, 1.17
// Append -bullseye or -buster to pin to an OS version.
// Use -bullseye variants on local arm64/Apple Silicon.
"VARIANT": "1-bullseye",
"VARIANT": "1.18-bullseye",
// Options
"NODE_VERSION": "none"
}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/crdgen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
crdgen:
strategy:
matrix:
go-version: ['1.17']
go-version: ['1.18']
os: [ubuntu-latest]
name: CRDs are Generated
runs-on: ${{ matrix.os }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

- uses: actions/setup-go@v2
with:
go-version: "^1.17"
go-version: "^1.18"

- name: Setup Kind
uses: engineerd/setup-kind@v0.5.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cyclonus-netpol-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

- uses: actions/setup-go@v2
with:
go-version: '^1.17'
go-version: '^1.18'

- name: Setup Kind
uses: engineerd/setup-kind@v0.5.0
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic multiverse" | sudo tee -a
RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic universe" | sudo tee -a /etc/apt/sources.list
RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic main" | sudo tee -a /etc/apt/sources.list
RUN apt-get update && apt-get install -y iptables ipset iproute2 ebtables
RUN wget -qO- https://golang.org/dl/go1.17.linux-amd64.tar.gz | tar zxf - -C /usr/lib/
RUN wget -qO- https://golang.org/dl/go1.18.linux-amd64.tar.gz | tar zxf - -C /usr/lib/
ENV PATH="/usr/lib/go/bin/:${PATH}"
ENV GOROOT="/usr/lib/go"
ENV GOPATH="/root/go"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/golang:1.17
FROM docker.io/golang:1.18

RUN apt-get update \
&& apt-get install -y zip \
Expand Down
2 changes: 1 addition & 1 deletion build/tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/Azure/azure-container-networking/build/tools

go 1.17
go 1.18

require (
github.com/AlekSi/gocov-xml v1.0.0
Expand Down
2 changes: 1 addition & 1 deletion cns/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM docker.io/alpine:latest as certs
RUN apk --update add ca-certificates

FROM docker.io/golang:1.17 AS builder
FROM docker.io/golang:1.18 AS builder
ARG VERSION
ARG CNS_AI_PATH
ARG CNS_AI_ID
Expand Down
2 changes: 1 addition & 1 deletion cns/windows.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build cns
FROM docker.io/golang:1.17 AS builder
FROM docker.io/golang:1.18 AS builder
# Build args
ARG VERSION
ARG CNS_AI_PATH
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/Azure/azure-container-networking

go 1.17
go 1.18

require (
code.cloudfoundry.org/clock v1.0.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions hack/toolbox/Dockerfile.windows
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build cns
FROM docker.io/golang:1.17 AS builder
FROM docker.io/golang:1.18 AS builder
# Build args
ARG VERSION
ARG CNS_AI_PATH
Expand All @@ -14,7 +14,7 @@ RUN $Env:CGO_ENABLED=0; go build -v -o /usr/local/bin/toolbox.exe -gcflags="-dwa
FROM mcr.microsoft.com/windows/servercore:ltsc2022
COPY --from=builder /usr/local/bin/toolbox.exe \
/usr/local/bin/toolbox.exe

RUN powershell.exe Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
RUN choco install -y vim wget

Expand Down
2 changes: 1 addition & 1 deletion npm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build npm
FROM docker.io/golang:1.17 AS builder
FROM docker.io/golang:1.18 AS builder
# Build args
ARG VERSION
ARG NPM_AI_PATH
Expand Down
2 changes: 1 addition & 1 deletion tools/acncli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/golang:1.17 as build
FROM docker.io/golang:1.18 as build
WORKDIR /go/src/github.com/Azure/azure-container-networking/
ARG VERSION
ARG PLATFORM
Expand Down