diff --git a/.circleci/config.yml b/.circleci/config.yml index e0af564c7..5f3c50887 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ jobs: build: docker: # specify the version - - image: circleci/golang:1.11 + - image: circleci/golang:1.12.9 working_directory: /go/src/github.com/storageos/cluster-operator steps: diff --git a/.travis.yml b/.travis.yml index 28668876e..f82c08526 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: required language: go go: - - "1.11" + - "1.12.9" env: global: diff --git a/Makefile b/Makefile index 13fc6cc19..ea98a874d 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ GO_BUILD_CMD = go build -v GO_ENV = GOOS=linux CGO_ENABLED=0 SDK_VERSION = v0.8.0 MACHINE = $(shell uname -m) -BUILD_IMAGE = golang:1.12.5 +BUILD_IMAGE = golang:1.12.9 BASE_IMAGE = storageos/base-image:0.1.0 # When this file name is modified, the new name must be added in .travis.yml diff --git a/build/Dockerfile b/build/Dockerfile index e1507f740..e3f4edd5d 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_IMAGE=golang:1.12.5 +ARG BUILD_IMAGE=golang:1.12.9 ARG BASE_IMAGE=storageos/base-image:0.1.0 ARG OPERATOR_IMAGE=storageos/cluster-operator:test @@ -15,18 +15,18 @@ RUN make build/upgrader FROM ${BASE_IMAGE} LABEL name="StorageOS Cluster Operator" \ - maintainer="support@storageos.com" \ - vendor="StorageOS" \ - version="1.3.0" \ - release="1" \ - distribution-scope="public" \ - architecture="x86_64" \ - url="https://docs.storageos.com" \ - io.k8s.description="The StorageOS Cluster Operator installs and manages StorageOS within a cluster." \ - io.k8s.display-name="StorageOS Cluster Operator" \ - io.openshift.tags="storageos,storage,operator,pv,pvc,storageclass,persistent,csi" \ - summary="Highly-available persistent block storage for containerized applications." \ - description="StorageOS transforms commodity server or cloud based disk capacity into enterprise-class storage to run persistent workloads such as databases in containers. Provides high availability, low latency persistent block storage. No other hardware or software is required." + maintainer="support@storageos.com" \ + vendor="StorageOS" \ + version="1.3.0" \ + release="1" \ + distribution-scope="public" \ + architecture="x86_64" \ + url="https://docs.storageos.com" \ + io.k8s.description="The StorageOS Cluster Operator installs and manages StorageOS within a cluster." \ + io.k8s.display-name="StorageOS Cluster Operator" \ + io.openshift.tags="storageos,storage,operator,pv,pvc,storageclass,persistent,csi" \ + summary="Highly-available persistent block storage for containerized applications." \ + description="StorageOS transforms commodity server or cloud based disk capacity into enterprise-class storage to run persistent workloads such as databases in containers. Provides high availability, low latency persistent block storage. No other hardware or software is required." # Docker is required by the upgrader to pre-load images. Only `docker pull` is # used. `podman` would be preferred but it's not available in the package repo, diff --git a/build/rhel-build-service/Dockerfile b/build/rhel-build-service/Dockerfile index 96a418f2a..f0846c659 100644 --- a/build/rhel-build-service/Dockerfile +++ b/build/rhel-build-service/Dockerfile @@ -1,8 +1,8 @@ -# ARG BUILD_IMAGE=golang:1.12.5 +# ARG BUILD_IMAGE=golang:1.12.9 # ARG BASE_IMAGE=storageos/base-image:0.1.0 # ARG OPERATOR_IMAGE=storageos/cluster-operator:test -FROM golang:1.12.5 AS build +FROM golang:1.12.9 AS build # OPERATOR_IMAGE needs to be passed to build/cluster-operator for constructing # the ldflags. # ARG OPERATOR_IMAGE @@ -16,18 +16,18 @@ RUN make build/upgrader FROM storageos/base-image:0.1.0 LABEL name="StorageOS Cluster Operator" \ - maintainer="support@storageos.com" \ - vendor="StorageOS" \ - version="1.3.0" \ - release="1" \ - distribution-scope="public" \ - architecture="x86_64" \ - url="https://docs.storageos.com" \ - io.k8s.description="The StorageOS Cluster Operator installs and manages StorageOS within a cluster." \ - io.k8s.display-name="StorageOS Cluster Operator" \ - io.openshift.tags="storageos,storage,operator,pv,pvc,storageclass,persistent,csi" \ - summary="Highly-available persistent block storage for containerized applications." \ - description="StorageOS transforms commodity server or cloud based disk capacity into enterprise-class storage to run persistent workloads such as databases in containers. Provides high availability, low latency persistent block storage. No other hardware or software is required." + maintainer="support@storageos.com" \ + vendor="StorageOS" \ + version="1.3.0" \ + release="1" \ + distribution-scope="public" \ + architecture="x86_64" \ + url="https://docs.storageos.com" \ + io.k8s.description="The StorageOS Cluster Operator installs and manages StorageOS within a cluster." \ + io.k8s.display-name="StorageOS Cluster Operator" \ + io.openshift.tags="storageos,storage,operator,pv,pvc,storageclass,persistent,csi" \ + summary="Highly-available persistent block storage for containerized applications." \ + description="StorageOS transforms commodity server or cloud based disk capacity into enterprise-class storage to run persistent workloads such as databases in containers. Provides high availability, low latency persistent block storage. No other hardware or software is required." # Docker is required by the upgrader to pre-load images. Only `docker pull` is # used. `podman` would be preferred but it's not available in the package repo,