diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d274a58b03af6558d428456cc6119aa15ef2b48f..947981d7fe878153085de4a491780ceb3a3cfa2f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ variables: GOSDN_IMAGE: "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}" GOSDN_TESTING_IMAGE: "${CI_REGISTRY_IMAGE}:testing_${CI_COMMIT_SHA}" CEOS_IMAGE: "${CI_PCONTAINERS_REGISTRY_IMAGE}/ceos:4.28.2F" - GOLANG_VERSION: "1.20.5" + GOLANG_VERSION: "1.20.6" workflow: rules: diff --git a/.gitlab/ci/.code-quality-ci.yml b/.gitlab/ci/.code-quality-ci.yml index bce2d382edbe388c9a3bb020602a6aa1af5b2991..97ffaf0fbfb1de7891929ce04a42fa8b94839299 100644 --- a/.gitlab/ci/.code-quality-ci.yml +++ b/.gitlab/ci/.code-quality-ci.yml @@ -1,5 +1,5 @@ variables: - GOLANG_VERSION: "1.20.5" + GOLANG_VERSION: "1.20.6" code-quality: image: golangci/golangci-lint:v1.52.2-alpine stage: analyze diff --git a/.golangci.yml b/.golangci.yml index 6951bf00f310987c08dd7bdd6ad9206219b0a1ee..8ffeff90bf8c49342e3b683a68a40265a9359f1a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,5 +1,5 @@ variables: - GOLANG_VERSION: "1.20.5" + GOLANG_VERSION: "1.20.6" run: go: $GOLANG_VERSION concurrency: 4 diff --git a/applications/arista-routing-engine/arista-routing-engine.Dockerfile b/applications/arista-routing-engine/arista-routing-engine.Dockerfile index dcbb7f9629454212b68773874e6b460ebe7e68b1..167be14543717ad33f7501a7ecc260ac01a022cc 100644 --- a/applications/arista-routing-engine/arista-routing-engine.Dockerfile +++ b/applications/arista-routing-engine/arista-routing-engine.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.20.5 +ARG GOLANG_VERSION=1.20.6 ARG BUILDARGS ARG $GITLAB_PROXY diff --git a/applications/venv-manager/venv-manager.Dockerfile b/applications/venv-manager/venv-manager.Dockerfile index a0e41399c56f7355af2469cc4f7e9f7b9735b665..05242691286489d2db6a4f7d672290b3e0517e06 100644 --- a/applications/venv-manager/venv-manager.Dockerfile +++ b/applications/venv-manager/venv-manager.Dockerfile @@ -1,8 +1,8 @@ -ARG GOLANG_VERSION=1.20.5 +ARG GOLANG_VERSION=1.20.6 ARG BUILDARGS ARG $GITLAB_PROXY=code.fbi.h-da.de:443/danet/dependency_proxy/containers -FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-buster AS builder +FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bullseye AS builder WORKDIR /gosdn diff --git a/cli/build/ci/.test.yml b/cli/build/ci/.test.yml index efad0a38837d1b054298c53a4ab2264a52f7869b..dbc634dcba9b5f95a43aa7d2e1657bc385aeb325 100644 --- a/cli/build/ci/.test.yml +++ b/cli/build/ci/.test.yml @@ -1,5 +1,5 @@ variables: - GOLANG_VERSION: "1.20.5" + GOLANG_VERSION: "1.20.6" test: image: golang:$GOLANG_VERSION stage: test diff --git a/cli/cli.Dockerfile b/cli/cli.Dockerfile index 545506e5ea67489f8b4cf6f78b6a6abfcff2d888..6bb710ed67387fd3e32d9e1b5ac4f019f385c2e8 100644 --- a/cli/cli.Dockerfile +++ b/cli/cli.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.20.5 +ARG GOLANG_VERSION=1.20.6 ARG BUILDARGS ARG $GITLAB_PROXY diff --git a/controller/Dockerfile.debug b/controller/Dockerfile.debug index a95924d916b03eff06f4d3389000c9afb3311fd8..9de4f65d7a9e7efa12cc634c1d13db173a89c7eb 100644 --- a/controller/Dockerfile.debug +++ b/controller/Dockerfile.debug @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.2 -ARG GOLANG_VERSION=1.20.5 +ARG GOLANG_VERSION=1.20.6 FROM golang:$GOLANG_VERSION-alpine AS builder ARG GITLAB_USER ARG GITLAB_TOKEN diff --git a/controller/controller.Dockerfile b/controller/controller.Dockerfile index 85a92dc86baac1547e73fa2585cb7f5ae957d7ae..a2716198dee7772cd3a7de52ffe54abe9f89696c 100644 --- a/controller/controller.Dockerfile +++ b/controller/controller.Dockerfile @@ -1,15 +1,15 @@ -ARG GOLANG_VERSION=1.20.5 +ARG GOLANG_VERSION=1.20.6 ARG BUILDARGS ARG $GITLAB_PROXY -FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-buster as builder +FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bullseye as builder WORKDIR /gosdn/ COPY . . RUN --mount=type=cache,target=/root/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ make build-gosdn -FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-buster +FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bullseye WORKDIR /app/ COPY --from=builder /gosdn/controller/configs/development-gosdn.toml.example ./configs/development-gosdn.toml COPY --from=builder /gosdn/controller/configs/containerlab-gosdn.toml.example ./configs/containerlab-gosdn.toml diff --git a/csbi/gnmi-target/gnmitarget.Dockerfile b/csbi/gnmi-target/gnmitarget.Dockerfile index 5d8f760f94d41f5765433834ff18540d0d6b15f2..dfd84068649c9699f56f273101a12e1baa104ed8 100644 --- a/csbi/gnmi-target/gnmitarget.Dockerfile +++ b/csbi/gnmi-target/gnmitarget.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.20.5 +ARG GOLANG_VERSION=1.20.6 FROM golang:$GOLANG_VERSION-alpine RUN go install github.com/google/gnxi/gnmi_target@latest RUN wget https://raw.githubusercontent.com/google/gnxi/master/gnmi_target/openconfig-openflow.json diff --git a/csbi/resources/Dockerfile b/csbi/resources/Dockerfile index 4e3437e331dac15580fcddd066e8cc6103bee4a4..85140b52996920ed7ae9c0070b352cd76b5dcd44 100644 --- a/csbi/resources/Dockerfile +++ b/csbi/resources/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.2 -ARG GOLANG_VERSION=1.20.5 +ARG GOLANG_VERSION=1.20.6 FROM golang:$GOLANG_VERSION-alpine AS installer ARG GITLAB_USER ARG GITLAB_TOKEN diff --git a/lab-vm/vm-with-packer/scripts/setup.sh b/lab-vm/vm-with-packer/scripts/setup.sh index 39018105e9e0053baabe8a42a44e8df81a2e3531..363285e8e935a3a1987edff27c5e68a5a9852c0c 100644 --- a/lab-vm/vm-with-packer/scripts/setup.sh +++ b/lab-vm/vm-with-packer/scripts/setup.sh @@ -5,9 +5,9 @@ sudo apt update sudo apt upgrade -y # Install go -wget https://go.dev/dl/go1.20.5.linux-amd64.tar.gz -sudo tar -C /usr/local/ -xzf go1.20.5.linux-amd64.tar.gz -rm go1.20.5.linux-amd64.tar.gz +wget https://go.dev/dl/go1.20.6.linux-amd64.tar.gz +sudo tar -C /usr/local/ -xzf go1.20.6.linux-amd64.tar.gz +rm go1.20.6.linux-amd64.tar.gz echo "export PATH=$PATH:/usr/local/go/bin" >>/home/gosdn/.profile echo "export GOPATH=$HOME/go " >>/home/gosdn/.profile source /home/gosdn/.profile diff --git a/lab-vm/vm-with-vagrant/Vagrantfile b/lab-vm/vm-with-vagrant/Vagrantfile index 61d1f9ecea7812008bf94202bf347ece36bd883d..83d7964d23e6be5d4d82d3bb9f408b809c2ec143 100644 --- a/lab-vm/vm-with-vagrant/Vagrantfile +++ b/lab-vm/vm-with-vagrant/Vagrantfile @@ -37,9 +37,9 @@ Vagrant.configure(2) do |config| zip apt-get autoremove -y ####### installing go ####### - wget https://go.dev/dl/go1.20.5.linux-amd64.tar.gz - rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.20.5.linux-amd64.tar.gz - rm go1.20.5.linux-amd64.tar.gz + wget https://go.dev/dl/go1.20.6.linux-amd64.tar.gz + rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.20.6.linux-amd64.tar.gz + rm go1.20.6.linux-amd64.tar.gz echo 'export PATH=$PATH:/usr/local/go/bin' >> /home/vagrant/.profile echo 'export GOPATH=$HOME/go' >> /home/vagrant/.profile source /home/vagrant/.profile diff --git a/plugin-registry/plugin-registry.Dockerfile b/plugin-registry/plugin-registry.Dockerfile index 898d29d08ae4a52d16a6ee4a4eca541a592ac7ec..1e579c337c0d095b714f498fba4e36de02ec86c3 100644 --- a/plugin-registry/plugin-registry.Dockerfile +++ b/plugin-registry/plugin-registry.Dockerfile @@ -1,8 +1,8 @@ -ARG GOLANG_VERSION=1.20.1 +ARG GOLANG_VERSION=1.20.6 ARG BUILDARGS ARG $GITLAB_PROXY -FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-buster as builder +FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bullseye as builder WORKDIR /plugin-registry/ RUN apt-get update RUN apt-get -y install --no-install-recommends zip diff --git a/plugin-registry/plugin-registry.debug.Dockerfile b/plugin-registry/plugin-registry.debug.Dockerfile index fb9eeaff7d582625bd712bba1f565f2f5166a51b..2fa02552d2b517c99de16192aa31229a06fb1459 100644 --- a/plugin-registry/plugin-registry.debug.Dockerfile +++ b/plugin-registry/plugin-registry.debug.Dockerfile @@ -1,8 +1,8 @@ -ARG GOLANG_VERSION=1.19 +ARG GOLANG_VERSION=1.20.6 ARG BUILDARGS ARG $GITLAB_PROXY -FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-buster as builder +FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bullseye as builder WORKDIR /plugin-registry/ RUN apt-get update RUN apt-get -y install --no-install-recommends zip