From fc7a9cd8893141e3cb61d5ded0b685ef7235965c Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.seidl@h-da.de>
Date: Mon, 8 May 2023 12:00:31 +0000
Subject: [PATCH] Update go fix vulnerability
See merge request danet/gosdn!465
Co-authored-by: Englert, Fabian Emil <fabian.e.englert@stud.h-da.de>
---
.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 | 2 +-
cli/build/ci/.test.yml | 2 +-
cli/cli.Dockerfile | 2 +-
controller/Dockerfile.debug | 4 ++--
controller/controller.Dockerfile | 2 +-
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 +++---
13 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4bb4551e..3b9929324 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.3"
+ GOLANG_VERSION: "1.20.4"
workflow:
rules:
diff --git a/.gitlab/ci/.code-quality-ci.yml b/.gitlab/ci/.code-quality-ci.yml
index 39d6d578d..341bcb6aa 100644
--- a/.gitlab/ci/.code-quality-ci.yml
+++ b/.gitlab/ci/.code-quality-ci.yml
@@ -1,5 +1,5 @@
variables:
- GOLANG_VERSION: "1.20.3"
+ GOLANG_VERSION: "1.20.4"
code-quality:
image: golangci/golangci-lint:v1.52.2-alpine
stage: analyze
diff --git a/.golangci.yml b/.golangci.yml
index a121dc080..7f01e42a8 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,5 +1,5 @@
variables:
- GOLANG_VERSION: "1.20.3"
+ GOLANG_VERSION: "1.20.4"
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 dbb3b7c6e..a634745fc 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.3
+ARG GOLANG_VERSION=1.20.4
ARG BUILDARGS
ARG $GITLAB_PROXY
diff --git a/applications/venv-manager/venv-manager.Dockerfile b/applications/venv-manager/venv-manager.Dockerfile
index a4d8f342f..20f535618 100644
--- a/applications/venv-manager/venv-manager.Dockerfile
+++ b/applications/venv-manager/venv-manager.Dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.20.3
+ARG GOLANG_VERSION=1.20.4
ARG BUILDARGS
ARG $GITLAB_PROXY=code.fbi.h-da.de:443/danet/dependency_proxy/containers
diff --git a/cli/build/ci/.test.yml b/cli/build/ci/.test.yml
index 912f2b63f..58d5a5a6f 100644
--- a/cli/build/ci/.test.yml
+++ b/cli/build/ci/.test.yml
@@ -1,5 +1,5 @@
variables:
- GOLANG_VERSION: "1.20.3"
+ GOLANG_VERSION: "1.20.4"
test:
image: golang:$GOLANG_VERSION
stage: test
diff --git a/cli/cli.Dockerfile b/cli/cli.Dockerfile
index e31269a3e..4083d0ef6 100644
--- a/cli/cli.Dockerfile
+++ b/cli/cli.Dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.20.3
+ARG GOLANG_VERSION=1.20.4
ARG BUILDARGS
ARG $GITLAB_PROXY
diff --git a/controller/Dockerfile.debug b/controller/Dockerfile.debug
index fc6c7b739..ded7ae211 100644
--- a/controller/Dockerfile.debug
+++ b/controller/Dockerfile.debug
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.2
-ARG GOLANG_VERSION=1.20.1
+ARG GOLANG_VERSION=1.20.4
FROM golang:$GOLANG_VERSION-alpine AS builder
ARG GITLAB_USER
ARG GITLAB_TOKEN
@@ -25,4 +25,4 @@ EXPOSE 40000
COPY --from=builder /src/gosdn /
COPY --from=builder /go/bin/dlv /
-CMD ["/dlv", "--listen=:40000", "--headless=true", "--api-version=2", "exec", "/gosdn"]
\ No newline at end of file
+CMD ["/dlv", "--listen=:40000", "--headless=true", "--api-version=2", "exec", "/gosdn"]
diff --git a/controller/controller.Dockerfile b/controller/controller.Dockerfile
index 3189236a2..3550b3367 100644
--- a/controller/controller.Dockerfile
+++ b/controller/controller.Dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.20.3
+ARG GOLANG_VERSION=1.20.4
ARG BUILDARGS
ARG $GITLAB_PROXY
diff --git a/csbi/gnmi-target/gnmitarget.Dockerfile b/csbi/gnmi-target/gnmitarget.Dockerfile
index 4e5a384f8..ffd050e64 100644
--- a/csbi/gnmi-target/gnmitarget.Dockerfile
+++ b/csbi/gnmi-target/gnmitarget.Dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.20.3
+ARG GOLANG_VERSION=1.20.4
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 c7cd03fe7..fb855579f 100644
--- a/csbi/resources/Dockerfile
+++ b/csbi/resources/Dockerfile
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.2
-ARG GOLANG_VERSION=1.20.3
+ARG GOLANG_VERSION=1.20.4
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 61fc5b46d..0cd154094 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.3.linux-amd64.tar.gz
-sudo tar -C /usr/local/ -xzf go1.20.3.linux-amd64.tar.gz
-rm go1.20.3.linux-amd64.tar.gz
+wget https://go.dev/dl/go1.20.4.linux-amd64.tar.gz
+sudo tar -C /usr/local/ -xzf go1.20.4.linux-amd64.tar.gz
+rm go1.20.4.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 dff2133e4..2b19abf5c 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.3.linux-amd64.tar.gz
- rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.20.3.linux-amd64.tar.gz
- rm go1.20.3.linux-amd64.tar.gz
+ wget https://go.dev/dl/go1.20.4.linux-amd64.tar.gz
+ rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.20.4.linux-amd64.tar.gz
+ rm go1.20.4.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
--
GitLab