Merge pull request #1115 from coreydaley/a_few_fixes

A few small fixes

.ci-operator.yaml

@@ -0,0 +1,4 @@
+build_root_image:
+  name: release
+  namespace: openshift
+  tag: rhel-8-release-golang-1.19-openshift-4.14

Dockerfile

@@ -1,4 +1,4 @@
-FROM openshift/origin-release:golang-1.13 AS builder
+FROM openshift/origin-release:golang-1.19 AS builder
 
 ENV S2I_GIT_VERSION="" \
     S2I_GIT_MAJOR="" \

OWNERS

@@ -1,8 +1,11 @@
 reviewers:
-  - adambkaplan
+  - apoorvajagtap
   - coreydaley
-  - gabemontero
+  - divyansh42
+  - jkhelil
+  - mbharatk
+  - otaviof
 approvers:
-  - adambkaplan
-  - bparees
   - coreydaley
+  - jkhelil
+  - otaviof

go.mod

@@ -1,6 +1,6 @@
 module github.com/openshift/source-to-image
 
-go 1.18
+go 1.19
 
 require (
 	github.com/containers/image/v5 v5.24.2

hack/build-release.sh

@@ -35,9 +35,16 @@ s2i::build::save_version_vars "${S2I_ROOT}/sti-version-defs"
 echo "++ Building release ${S2I_GIT_VERSION}"
 
 # Perform the build and release in podman or docker.
-$buildCmd run --rm -it -e RELEASE_LDFLAGS="-w -s" \
+if [[ "$(go env GOHOSTOS)" == "darwin" ]]; then
+    $buildCmd run --rm -it -e RELEASE_LDFLAGS="-w -s" \
+  -v "${S2I_ROOT}":/go/src/github.com/openshift/source-to-image \
+  openshift/sti-release
+  else
+    $buildCmd run --rm -it -e RELEASE_LDFLAGS="-w -s" \
   -v "${S2I_ROOT}":/go/src/github.com/openshift/source-to-image:z \
   openshift/sti-release
+  fi
+
 echo "${S2I_GIT_COMMIT}" > "${S2I_LOCAL_RELEASEPATH}/.commit"
 
 ret=$?; ENDTIME=$(date +%s); echo "$0 took $((ENDTIME - STARTTIME)) seconds"; exit "$ret"