From 6d418e5d91b9a5f8f1e8e07c06364bcd524a59eb Mon Sep 17 00:00:00 2001
From: Katharina Renk <katharina.renk@stud.h-da.de>
Date: Mon, 20 Feb 2023 16:30:28 +0100
Subject: [PATCH] updated golang version, added variables for better visibility
of current used version
---
.gitlab-ci.yml | 2 +-
.gitlab/ci/.code-quality-ci.yml | 4 +++-
.golangci.yml | 4 +++-
.../arista-routing-engine/arista-routing-engine.Dockerfile | 2 +-
applications/venv-manager/venv-manager.Dockerfile | 2 +-
cli/build/ci/.test.yml | 6 ++++--
cli/cli.Dockerfile | 2 +-
controller/Dockerfile.debug | 4 ++--
controller/controller.Dockerfile | 2 +-
csbi/csbi.Dockerfile | 2 +-
csbi/gnmi-target/gnmitarget.Dockerfile | 3 ++-
csbi/resources/Dockerfile | 3 ++-
csbi/resources/go.mod | 2 +-
go.mod | 2 +-
14 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6411485b9..ab2068afa 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.19"
+ GOLANG_VERSION: "1.20.1"
workflow:
rules:
diff --git a/.gitlab/ci/.code-quality-ci.yml b/.gitlab/ci/.code-quality-ci.yml
index 8b9b87b32..85f49c09e 100644
--- a/.gitlab/ci/.code-quality-ci.yml
+++ b/.gitlab/ci/.code-quality-ci.yml
@@ -1,3 +1,5 @@
+variables:
+ GOLANG_VERSION: "1.20.1"
code-quality:
image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/golangci/golangci-lint:v1.46-alpine
stage: analyze
@@ -13,7 +15,7 @@ code-quality:
needs: []
code-vulnerability:
- image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/golang:1.19-bullseye
+ image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/golang:$GOLANG_VERSION-bullseye
stage: analyze
script:
- go install golang.org/x/vuln/cmd/govulncheck@latest
diff --git a/.golangci.yml b/.golangci.yml
index 23055a37b..652493ad3 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,5 +1,7 @@
+variables:
+ GOLANG_VERSION: "1.20.1"
run:
- go: 1.19
+ go: $GOLANG_VERSION
concurrency: 4
timeout: 10m
issues-exit-code: 1
diff --git a/applications/arista-routing-engine/arista-routing-engine.Dockerfile b/applications/arista-routing-engine/arista-routing-engine.Dockerfile
index 6dfdfa4a8..2ebb760d2 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.18
+ARG GOLANG_VERSION=1.20.1
ARG BUILDARGS
ARG $GITLAB_PROXY
diff --git a/applications/venv-manager/venv-manager.Dockerfile b/applications/venv-manager/venv-manager.Dockerfile
index 667afe0c0..a595e29f7 100644
--- a/applications/venv-manager/venv-manager.Dockerfile
+++ b/applications/venv-manager/venv-manager.Dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.19
+ARG GOLANG_VERSION=1.20.1
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 ae33d27b1..594871cc8 100644
--- a/cli/build/ci/.test.yml
+++ b/cli/build/ci/.test.yml
@@ -1,5 +1,7 @@
+variables:
+ GOLANG_VERSION: "1.20.1"
test:
- image: golang:1.19
+ image: golang:$GOLANG_VERSION
stage: test
needs:
- job: "apply"
@@ -22,7 +24,7 @@ test:
- go test -race ./test/integration -v -coverprofile=coverage.out
.test: &test
- image: golang:1.19
+ image: golang:$GOLANG_VERSION
stage: test
allow_failure: true
variables:
diff --git a/cli/cli.Dockerfile b/cli/cli.Dockerfile
index 71e72da76..59692dcea 100644
--- a/cli/cli.Dockerfile
+++ b/cli/cli.Dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.19
+ARG GOLANG_VERSION=1.20.1
ARG BUILDARGS
ARG $GITLAB_PROXY
diff --git a/controller/Dockerfile.debug b/controller/Dockerfile.debug
index a2460463b..fc6c7b739 100644
--- a/controller/Dockerfile.debug
+++ b/controller/Dockerfile.debug
@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1.2
-
-FROM golang:1.16-alpine AS builder
+ARG GOLANG_VERSION=1.20.1
+FROM golang:$GOLANG_VERSION-alpine AS builder
ARG GITLAB_USER
ARG GITLAB_TOKEN
ARG BUILDARGS
diff --git a/controller/controller.Dockerfile b/controller/controller.Dockerfile
index d8dd3592f..dc6171ff7 100644
--- a/controller/controller.Dockerfile
+++ b/controller/controller.Dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.19
+ARG GOLANG_VERSION=1.20.1
ARG BUILDARGS
ARG $GITLAB_PROXY
diff --git a/csbi/csbi.Dockerfile b/csbi/csbi.Dockerfile
index b9b3adeba..a20a43e0a 100644
--- a/csbi/csbi.Dockerfile
+++ b/csbi/csbi.Dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.19
+ARG GOLANG_VERSION=1.20.1
ARG BUILDARGS
ARG $GITLAB_PROXY
diff --git a/csbi/gnmi-target/gnmitarget.Dockerfile b/csbi/gnmi-target/gnmitarget.Dockerfile
index 4af5963a8..3bc5056f4 100644
--- a/csbi/gnmi-target/gnmitarget.Dockerfile
+++ b/csbi/gnmi-target/gnmitarget.Dockerfile
@@ -1,4 +1,5 @@
-FROM golang:1.19-alpine
+ARG GOLANG_VERSION=1.20.1
+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
EXPOSE 7030
diff --git a/csbi/resources/Dockerfile b/csbi/resources/Dockerfile
index 7ce79f876..f83888778 100644
--- a/csbi/resources/Dockerfile
+++ b/csbi/resources/Dockerfile
@@ -1,5 +1,6 @@
# syntax = docker/dockerfile:1.2
-FROM golang:1.19-alpine AS installer
+ARG GOLANG_VERSION=1.20.1
+FROM golang:$GOLANG_VERSION-alpine AS installer
ARG GITLAB_USER
ARG GITLAB_TOKEN
WORKDIR /src/csbi
diff --git a/csbi/resources/go.mod b/csbi/resources/go.mod
index 4003eb662..41b7e9335 100644
--- a/csbi/resources/go.mod
+++ b/csbi/resources/go.mod
@@ -1,6 +1,6 @@
module code.fbi.h-da.de/danet/gosdn/csbi-autogen
-go 1.19
+go 1.20
require (
code.fbi.h-da.de/danet/gosdn v0.0.3-0.20220805102430-8465989fb8b3
diff --git a/go.mod b/go.mod
index 743d59d48..445dffb6f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module code.fbi.h-da.de/danet/gosdn
-go 1.19
+go 1.20
require (
github.com/aristanetworks/goarista v0.0.0-20220425175323-05f7c4c5e34c
--
GitLab