Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A few small fixes #1115

Merged
merged 1 commit into from
Mar 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .ci-operator.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.19-openshift-4.14
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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="" \
Expand Down
11 changes: 7 additions & 4 deletions OWNERS
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
reviewers:
- adambkaplan
- apoorvajagtap
- coreydaley
- gabemontero
- divyansh42
- jkhelil
- mbharatk
- otaviof
approvers:
- adambkaplan
- bparees
- coreydaley
- jkhelil
- otaviof
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 8 additions & 1 deletion hack/build-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"