Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.
This repository is currently being migrated. It's locked while the migration is in progress.

Commit

Permalink
Merge pull request #156 from darkowlzz/go1.12.9
Browse files Browse the repository at this point in the history
Update to go 1.12.9
  • Loading branch information
darkowlzz authored Sep 3, 2019
2 parents 43e75ed + 1d5f060 commit 43761b7
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sudo: required
language: go

go:
- "1.11"
- "1.12.9"

env:
global:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 13 additions & 13 deletions build/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -15,18 +15,18 @@ RUN make build/upgrader

FROM ${BASE_IMAGE}
LABEL name="StorageOS Cluster Operator" \
maintainer="[email protected]" \
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="[email protected]" \
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,
Expand Down
28 changes: 14 additions & 14 deletions build/rhel-build-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -16,18 +16,18 @@ RUN make build/upgrader

FROM storageos/base-image:0.1.0
LABEL name="StorageOS Cluster Operator" \
maintainer="[email protected]" \
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="[email protected]" \
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,
Expand Down

0 comments on commit 43761b7

Please sign in to comment.