From 8df76ce0b875d37621345525e6c9a03129d320ba Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.seidl@h-da.de>
Date: Tue, 18 Jul 2023 13:15:53 +0000
Subject: [PATCH] Update go fix vulnerability 2
See merge request danet/gosdn!492
---
.gitlab-ci.yml | 2 +-
.gitlab/ci/.code-quality-ci.yml | 2 +-
.golangci.yml | 2 +-
.../arista-routing-engine/arista-routing-engine.Dockerfile | 2 +-
applications/venv-manager/venv-manager.Dockerfile | 4 ++--
cli/build/ci/.test.yml | 2 +-
cli/cli.Dockerfile | 2 +-
controller/Dockerfile.debug | 2 +-
controller/controller.Dockerfile | 6 +++---
csbi/gnmi-target/gnmitarget.Dockerfile | 2 +-
csbi/resources/Dockerfile | 2 +-
lab-vm/vm-with-packer/scripts/setup.sh | 6 +++---
lab-vm/vm-with-vagrant/Vagrantfile | 6 +++---
plugin-registry/plugin-registry.Dockerfile | 4 ++--
plugin-registry/plugin-registry.debug.Dockerfile | 4 ++--
15 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d274a58b0..947981d7f 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 bce2d382e..97ffaf0fb 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 6951bf00f..8ffeff90b 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 dcbb7f962..167be1454 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 a0e41399c..052426912 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 efad0a388..dbc634dcb 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 545506e5e..6bb710ed6 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 a95924d91..9de4f65d7 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 85a92dc86..a2716198d 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 5d8f760f9..dfd840686 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 4e3437e33..85140b529 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 39018105e..363285e8e 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 61d1f9ece..83d7964d2 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 898d29d08..1e579c337 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 fb9eeaff7..2fa02552d 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
--
GitLab