Skip to content

Commit

Permalink
Merge pull request #20 from slintes/fix-dockerized-check
Browse files Browse the repository at this point in the history
Some fixes
  • Loading branch information
openshift-merge-bot[bot] authored Jan 26, 2024
2 parents 94d6cc4 + 8ae469a commit 4ddee71
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
namespace: openshift
name: release
tag: rhel-8-release-golang-1.20-openshift-4.14
tag: golang-1.20
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,9 @@ bin
*.swo
*~
/testbin/

# we never want vendor
/vendor/

# personal env files
.envrc
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# SHELL defines bash so all the inline scripts here will work as expected.
SHELL := /bin/bash

# GO_VERSION refers to the version of Golang to be downloaded when running dockerized version
GO_VERSION = 1.20
GOIMPORTS_VERSION = v0.11.0
Expand All @@ -12,7 +15,7 @@ SORT_IMPORTS_VERSION = v0.2.1
# --entrypoint /bin bash ... -c = run bash -c on start; that means the actual command(s) need be wrapped in double quotes, see e.g. check target which will run: bash -c "make test"
export DOCKER_GO=docker run --rm -v $$(pwd):/home/go/src/github.com/medik8s/common \
-u $$(id -u) -w /home/go/src/github.com/medik8s/common \
-e "GOPATH=/go" -e "GOFLAGS=-mod=vendor" -e "XDG_CACHE_HOME=/tmp/.cache" \
-e "GOPATH=/go" -e "XDG_CACHE_HOME=/tmp/.cache" \
--entrypoint /bin/bash golang:$(GO_VERSION) -c

# go-install-tool will 'go install' any package $2 and install it to $1.
Expand Down
1 change: 1 addition & 0 deletions hack/verify-diff.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#/bin/bash
FILE_DIFF=$(git ls-files -o --exclude-standard)

if [ "$FILE_DIFF" != "" ]; then
Expand Down

0 comments on commit 4ddee71

Please sign in to comment.