github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-02 01:19:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #723 from s1061123/update-go-version

Browse Source 
Update golang version (at least >= 1.16)
This commit is contained in:
Doug Smith
2021-09-15 08:13:42 -04:00
committed by GitHub
parent a28f5cb56c 35fdb29385
commit e1b0698eb2
8 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -4,7 +4,7 @@ jobs:
build: build:
strategy: strategy:
matrix: matrix:
go-version: [1.15.x, 1.16.x] go-version: [1.16.x, 1.17.x]
goarch: [386, amd64, arm, arm64, ppc64le, s390x] goarch: [386, amd64, arm, arm64, ppc64le, s390x]
os: [ubuntu-latest] #, macos-latest, windows-latest] os: [ubuntu-latest] #, macos-latest, windows-latest]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}

2
.github/workflows/test.yml vendored
View File

@@ -4,7 +4,7 @@ jobs:
test: test:
strategy: strategy:
matrix: matrix:
go-version: [1.15.x, 1.16.x] go-version: [1.16.x, 1.17.x]
os: [ubuntu-latest] os: [ubuntu-latest]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:

11
deployments/Dockerfile
View File

@@ -1,16 +1,11 @@
# This Dockerfile is used to build the image available on DockerHub # This Dockerfile is used to build the image available on DockerHub
FROM centos:centos7 as build FROM golang:1.17.1 as build
# Add everything # Add everything
ADD . /usr/src/multus-cni ADD . /usr/src/multus-cni
ENV INSTALL_PKGS "git golang-1.15.13-0.el7.x86_64" RUN cd /usr/src/multus-cni && \
RUN rpm --import https://mirror.go-repo.io/centos/RPM-GPG-KEY-GO-REPO && \ ./hack/build-go.sh
curl -s https://mirror.go-repo.io/centos/go-repo.repo | tee /etc/yum.repos.d/go-repo.repo && \
yum install -y $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
cd /usr/src/multus-cni && \
./hack/build-go.sh
FROM centos:centos7 FROM centos:centos7
LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni

2
deployments/Dockerfile.arm32
View File

@@ -1,5 +1,5 @@
# This Dockerfile is used to build the image available on DockerHub # This Dockerfile is used to build the image available on DockerHub
FROM golang:1.13.4 as build FROM golang:1.17.1 as build
# Add everything # Add everything
ADD . /usr/src/multus-cni ADD . /usr/src/multus-cni

2
deployments/Dockerfile.arm64
View File

@@ -1,5 +1,5 @@
# This Dockerfile is used to build the image available on DockerHub # This Dockerfile is used to build the image available on DockerHub
FROM golang:1.13.4 as build FROM golang:1.17.1 as build
# Add everything # Add everything
ADD . /usr/src/multus-cni ADD . /usr/src/multus-cni

2
deployments/Dockerfile.openshift
View File

@@ -1,5 +1,5 @@
# This dockerfile is specific to building Multus for OpenShift # This dockerfile is specific to building Multus for OpenShift
FROM openshift/origin-release:golang-1.15 as builder FROM openshift/origin-release:golang-1.16 as builder
ADD . /usr/src/multus-cni ADD . /usr/src/multus-cni

11
deployments/Dockerfile.ppc64le
View File

@@ -1,5 +1,5 @@
# This Dockerfile is used to build the image available on DockerHub # This Dockerfile is used to build the image available on DockerHub
FROM centos:centos7 as build FROM golang:1.17.1 as build
# Add everything # Add everything
ADD . /usr/src/multus-cni ADD . /usr/src/multus-cni
@@ -7,13 +7,8 @@ ADD . /usr/src/multus-cni
ENV GOARCH "ppc64le" ENV GOARCH "ppc64le"
ENV GOOS "linux" ENV GOOS "linux"
ENV INSTALL_PKGS "git golang" RUN cd /usr/src/multus-cni && \
RUN rpm --import https://mirror.go-repo.io/centos/RPM-GPG-KEY-GO-REPO && \ ./hack/build-go.sh
curl -s https://mirror.go-repo.io/centos/go-repo.repo | tee /etc/yum.repos.d/go-repo.repo && \
yum install -y $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
cd /usr/src/multus-cni && \
./hack/build-go.sh
# build ppc container # build ppc container
FROM ppc64le/centos:latest FROM ppc64le/centos:latest

2
deployments/Dockerfile.s390x
View File

@@ -1,5 +1,5 @@
# This Dockerfile is used to build the image available on DockerHub # This Dockerfile is used to build the image available on DockerHub
FROM golang:1.13 as build FROM golang:1.17 as build
# Add everything # Add everything
ADD . /usr/src/multus-cni ADD . /usr/src/multus-cni