Skip to content
Snippets Groups Projects
Commit 8df76ce0 authored by Fabian Seidl's avatar Fabian Seidl Committed by Malte Bauch
Browse files

Update go fix vulnerability 2

See merge request !492
parent 5a636da4
Branches
Tags
1 merge request!492Update go fix vulnerability 2
Pipeline #158334 failed
Showing with 24 additions and 24 deletions
...@@ -2,7 +2,7 @@ variables: ...@@ -2,7 +2,7 @@ variables:
GOSDN_IMAGE: "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}" GOSDN_IMAGE: "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}"
GOSDN_TESTING_IMAGE: "${CI_REGISTRY_IMAGE}:testing_${CI_COMMIT_SHA}" GOSDN_TESTING_IMAGE: "${CI_REGISTRY_IMAGE}:testing_${CI_COMMIT_SHA}"
CEOS_IMAGE: "${CI_PCONTAINERS_REGISTRY_IMAGE}/ceos:4.28.2F" CEOS_IMAGE: "${CI_PCONTAINERS_REGISTRY_IMAGE}/ceos:4.28.2F"
GOLANG_VERSION: "1.20.5" GOLANG_VERSION: "1.20.6"
workflow: workflow:
rules: rules:
......
variables: variables:
GOLANG_VERSION: "1.20.5" GOLANG_VERSION: "1.20.6"
code-quality: code-quality:
image: golangci/golangci-lint:v1.52.2-alpine image: golangci/golangci-lint:v1.52.2-alpine
stage: analyze stage: analyze
......
variables: variables:
GOLANG_VERSION: "1.20.5" GOLANG_VERSION: "1.20.6"
run: run:
go: $GOLANG_VERSION go: $GOLANG_VERSION
concurrency: 4 concurrency: 4
......
ARG GOLANG_VERSION=1.20.5 ARG GOLANG_VERSION=1.20.6
ARG BUILDARGS ARG BUILDARGS
ARG $GITLAB_PROXY ARG $GITLAB_PROXY
......
ARG GOLANG_VERSION=1.20.5 ARG GOLANG_VERSION=1.20.6
ARG BUILDARGS ARG BUILDARGS
ARG $GITLAB_PROXY=code.fbi.h-da.de:443/danet/dependency_proxy/containers 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 WORKDIR /gosdn
......
variables: variables:
GOLANG_VERSION: "1.20.5" GOLANG_VERSION: "1.20.6"
test: test:
image: golang:$GOLANG_VERSION image: golang:$GOLANG_VERSION
stage: test stage: test
......
ARG GOLANG_VERSION=1.20.5 ARG GOLANG_VERSION=1.20.6
ARG BUILDARGS ARG BUILDARGS
ARG $GITLAB_PROXY ARG $GITLAB_PROXY
......
# syntax = docker/dockerfile:1.2 # syntax = docker/dockerfile:1.2
ARG GOLANG_VERSION=1.20.5 ARG GOLANG_VERSION=1.20.6
FROM golang:$GOLANG_VERSION-alpine AS builder FROM golang:$GOLANG_VERSION-alpine AS builder
ARG GITLAB_USER ARG GITLAB_USER
ARG GITLAB_TOKEN ARG GITLAB_TOKEN
......
ARG GOLANG_VERSION=1.20.5 ARG GOLANG_VERSION=1.20.6
ARG BUILDARGS ARG BUILDARGS
ARG $GITLAB_PROXY ARG $GITLAB_PROXY
FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-buster as builder FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bullseye as builder
WORKDIR /gosdn/ WORKDIR /gosdn/
COPY . . COPY . .
RUN --mount=type=cache,target=/root/go/pkg/mod \ RUN --mount=type=cache,target=/root/go/pkg/mod \
--mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/root/.cache/go-build \
make build-gosdn make build-gosdn
FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-buster FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bullseye
WORKDIR /app/ WORKDIR /app/
COPY --from=builder /gosdn/controller/configs/development-gosdn.toml.example ./configs/development-gosdn.toml 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 COPY --from=builder /gosdn/controller/configs/containerlab-gosdn.toml.example ./configs/containerlab-gosdn.toml
......
ARG GOLANG_VERSION=1.20.5 ARG GOLANG_VERSION=1.20.6
FROM golang:$GOLANG_VERSION-alpine FROM golang:$GOLANG_VERSION-alpine
RUN go install github.com/google/gnxi/gnmi_target@latest RUN go install github.com/google/gnxi/gnmi_target@latest
RUN wget https://raw.githubusercontent.com/google/gnxi/master/gnmi_target/openconfig-openflow.json RUN wget https://raw.githubusercontent.com/google/gnxi/master/gnmi_target/openconfig-openflow.json
......
# syntax = docker/dockerfile:1.2 # syntax = docker/dockerfile:1.2
ARG GOLANG_VERSION=1.20.5 ARG GOLANG_VERSION=1.20.6
FROM golang:$GOLANG_VERSION-alpine AS installer FROM golang:$GOLANG_VERSION-alpine AS installer
ARG GITLAB_USER ARG GITLAB_USER
ARG GITLAB_TOKEN ARG GITLAB_TOKEN
......
...@@ -5,9 +5,9 @@ sudo apt update ...@@ -5,9 +5,9 @@ sudo apt update
sudo apt upgrade -y sudo apt upgrade -y
# Install go # Install go
wget https://go.dev/dl/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.5.linux-amd64.tar.gz sudo tar -C /usr/local/ -xzf go1.20.6.linux-amd64.tar.gz
rm go1.20.5.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 PATH=$PATH:/usr/local/go/bin" >>/home/gosdn/.profile
echo "export GOPATH=$HOME/go " >>/home/gosdn/.profile echo "export GOPATH=$HOME/go " >>/home/gosdn/.profile
source /home/gosdn/.profile source /home/gosdn/.profile
......
...@@ -37,9 +37,9 @@ Vagrant.configure(2) do |config| ...@@ -37,9 +37,9 @@ Vagrant.configure(2) do |config|
zip zip
apt-get autoremove -y apt-get autoremove -y
####### installing go ####### ####### installing go #######
wget https://go.dev/dl/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.5.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.5.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 PATH=$PATH:/usr/local/go/bin' >> /home/vagrant/.profile
echo 'export GOPATH=$HOME/go' >> /home/vagrant/.profile echo 'export GOPATH=$HOME/go' >> /home/vagrant/.profile
source /home/vagrant/.profile source /home/vagrant/.profile
......
ARG GOLANG_VERSION=1.20.1 ARG GOLANG_VERSION=1.20.6
ARG BUILDARGS ARG BUILDARGS
ARG $GITLAB_PROXY ARG $GITLAB_PROXY
FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-buster as builder FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bullseye as builder
WORKDIR /plugin-registry/ WORKDIR /plugin-registry/
RUN apt-get update RUN apt-get update
RUN apt-get -y install --no-install-recommends zip RUN apt-get -y install --no-install-recommends zip
......
ARG GOLANG_VERSION=1.19 ARG GOLANG_VERSION=1.20.6
ARG BUILDARGS ARG BUILDARGS
ARG $GITLAB_PROXY ARG $GITLAB_PROXY
FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-buster as builder FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bullseye as builder
WORKDIR /plugin-registry/ WORKDIR /plugin-registry/
RUN apt-get update RUN apt-get update
RUN apt-get -y install --no-install-recommends zip RUN apt-get -y install --no-install-recommends zip
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment