From 0fe4bd098a0eba67215fec0e7975b2f496a55ae5 Mon Sep 17 00:00:00 2001 From: danielhelfand Date: Mon, 17 Jun 2019 11:31:04 -0400 Subject: [PATCH 1/4] update READMEs to match go versions, update centos to 1.10.2 --- .gitignore | 3 +++ imagestreams/golang-centos7.json | 12 ++++++------ imagestreams/golang-rhel7.json | 10 +++++----- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 02ec6e3..63a18b3 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,6 @@ coverage.xml # Translations *.mo *.pot + +#macOS +.DS_Store diff --git a/imagestreams/golang-centos7.json b/imagestreams/golang-centos7.json index 578ab36..44f4b88 100644 --- a/imagestreams/golang-centos7.json +++ b/imagestreams/golang-centos7.json @@ -10,8 +10,9 @@ "spec": { "tags": [ { + "name": "latest", "annotations": { - "description": "Build and run Go applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Go available on OpenShift, including major versions updates.", + "description": "Build and run Go applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/1.10/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Go available on OpenShift, including major versions updates.", "iconClass": "icon-go-gopher", "openshift.io/display-name": "Go (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -21,18 +22,18 @@ }, "from": { "kind": "ImageStreamTag", - "name": "1.8" + "name": "1.10.2" }, - "name": "latest", "referencePolicy": { "type": "Local" } }, { + "name": "1.10.2", "annotations": { - "description": "Build and run Go applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Go available on OpenShift, including major versions updates.", + "description": "Build and run Go applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/1.10/README.md.", "iconClass": "icon-go-gopher", - "openshift.io/display-name": "Go (1.8)", + "openshift.io/display-name": "Go 1.10.2", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/golang-ex.git", "supports": "golang", @@ -42,7 +43,6 @@ "kind": "DockerImage", "name": "docker.io/centos/go-toolset-7-centos7:latest" }, - "name": "1.8", "referencePolicy": { "type": "Local" } diff --git a/imagestreams/golang-rhel7.json b/imagestreams/golang-rhel7.json index 41d80dc..d073d12 100644 --- a/imagestreams/golang-rhel7.json +++ b/imagestreams/golang-rhel7.json @@ -10,8 +10,9 @@ "spec": { "tags": [ { + "name": "latest", "annotations": { - "description": "Build and run Go applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Go available on OpenShift, including major version updates.", + "description": "Build and run Go applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/1.11/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Go available on OpenShift, including major version updates.", "iconClass": "icon-go-gopher", "openshift.io/display-name": "Go (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -23,16 +24,16 @@ "kind": "ImageStreamTag", "name": "1.11.5" }, - "name": "latest", "referencePolicy": { "type": "Local" } }, { + "name": "1.11.5", "annotations": { - "description": "Build and run Go applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Go available on OpenShift, including major version updates.", + "description": "Build and run Go applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/1.11/README.md", "iconClass": "icon-go-gopher", - "openshift.io/display-name": "Go (1.11.5)", + "openshift.io/display-name": "Go 1.11.5", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/golang-ex.git", "supports": "golang", @@ -42,7 +43,6 @@ "kind": "DockerImage", "name": "registry.redhat.io/devtools/go-toolset-rhel7:1.11.5" }, - "name": "1.11.5", "referencePolicy": { "type": "Local" } From 75f49a5bdc3fbc13a1e19dc31409595a8fab2c5c Mon Sep 17 00:00:00 2001 From: danielhelfand Date: Fri, 28 Jun 2019 14:11:23 -0400 Subject: [PATCH 2/4] update description and remove versions typo --- imagestreams/golang-centos7.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imagestreams/golang-centos7.json b/imagestreams/golang-centos7.json index 44f4b88..57406ca 100644 --- a/imagestreams/golang-centos7.json +++ b/imagestreams/golang-centos7.json @@ -12,7 +12,7 @@ { "name": "latest", "annotations": { - "description": "Build and run Go applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/1.10/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Go available on OpenShift, including major versions updates.", + "description": "Build and run Go applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/1.10/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Go available on OpenShift, including major version updates.", "iconClass": "icon-go-gopher", "openshift.io/display-name": "Go (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -31,7 +31,7 @@ { "name": "1.10.2", "annotations": { - "description": "Build and run Go applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/1.10/README.md.", + "description": "Build and run Go 1.10.2 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/1.10/README.md.", "iconClass": "icon-go-gopher", "openshift.io/display-name": "Go 1.10.2", "openshift.io/provider-display-name": "Red Hat, Inc.", From beeaa30d84e81df7f34555e5517d3b933285b4b1 Mon Sep 17 00:00:00 2001 From: danielhelfand Date: Sat, 29 Jun 2019 12:52:40 -0400 Subject: [PATCH 3/4] use 1.10 instead of 1.10.2 and add version field --- imagestreams/golang-centos7.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/imagestreams/golang-centos7.json b/imagestreams/golang-centos7.json index 57406ca..8e538d9 100644 --- a/imagestreams/golang-centos7.json +++ b/imagestreams/golang-centos7.json @@ -22,22 +22,23 @@ }, "from": { "kind": "ImageStreamTag", - "name": "1.10.2" + "name": "1.10" }, "referencePolicy": { "type": "Local" } }, { - "name": "1.10.2", + "name": "1.10", "annotations": { - "description": "Build and run Go 1.10.2 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/1.10/README.md.", + "description": "Build and run Go 1.10 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/1.10/README.md.", "iconClass": "icon-go-gopher", - "openshift.io/display-name": "Go 1.10.2", + "openshift.io/display-name": "Go 1.10", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/golang-ex.git", "supports": "golang", - "tags": "builder,golang,go" + "tags": "builder,golang,go", + "version": "1.10" }, "from": { "kind": "DockerImage", From 38e81c221d1e22edb2cc988bc0e43a922ff41f1a Mon Sep 17 00:00:00 2001 From: danielhelfand Date: Sat, 29 Jun 2019 13:31:13 -0400 Subject: [PATCH 4/4] add version field --- imagestreams/golang-rhel7.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/imagestreams/golang-rhel7.json b/imagestreams/golang-rhel7.json index d073d12..6dcc9bc 100644 --- a/imagestreams/golang-rhel7.json +++ b/imagestreams/golang-rhel7.json @@ -31,13 +31,14 @@ { "name": "1.11.5", "annotations": { - "description": "Build and run Go applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/1.11/README.md", + "description": "Build and run Go 1.11 applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/1.11/README.md", "iconClass": "icon-go-gopher", "openshift.io/display-name": "Go 1.11.5", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/golang-ex.git", "supports": "golang", - "tags": "builder,golang,go" + "tags": "builder,golang,go", + "version": "1.11.5" }, "from": { "kind": "DockerImage",