Skip to content
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
1 change: 0 additions & 1 deletion OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ aliases:
- ravitri
srep-team-leads:
- rafael-azevedo
- iamkirkbater
- dustman9000
- bmeng
- typeid
Expand Down
2 changes: 1 addition & 1 deletion boilerplate/_data/last-boilerplate-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1cb129aed5a91f2098f70c0e141561e00b1e16fc
8fb7c801f68dc7e06e8d2ae138c2a98f0b234b56
7 changes: 6 additions & 1 deletion boilerplate/_lib/container-make
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@ if [[ "${CONTAINER_ENGINE##*/}" == "podman" ]] && [[ $OSTYPE == *"linux"* ]]; th
else
CE_OPTS="${CE_OPTS} -v $REPO_ROOT:$CONTAINER_MOUNT"
fi
container_id=$($CONTAINER_ENGINE run -d ${CE_OPTS} $IMAGE_PULL_PATH sleep infinity)
container_id=$($CONTAINER_ENGINE run --rm -d ${CE_OPTS} $IMAGE_PULL_PATH sleep infinity)

if [[ $? -ne 0 ]] || [[ -z "$container_id" ]]; then
err "Couldn't start detached container"
fi

trap "$CONTAINER_ENGINE stop $container_id >/dev/null 2>&1" EXIT

# Now run our `make` command in it with the right UID and working directory
args="exec -it -u $(id -u):0 -w $CONTAINER_MOUNT $container_id"
banner "Running: make $@"
Expand All @@ -52,6 +54,9 @@ if [[ $rc -ne 0 ]]; then
fi
fi

# Disarm the interrupt trap -- normal cleanup handles it from here
trap - EXIT

# Finally, remove the container
banner "Cleaning up the container"
$CONTAINER_ENGINE rm -f $container_id >/dev/null
Expand Down
1 change: 0 additions & 1 deletion boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ aliases:
- ravitri
srep-team-leads:
- rafael-azevedo
- iamkirkbater
- dustman9000
- bmeng
- typeid
Expand Down
5 changes: 5 additions & 0 deletions boilerplate/openshift/golang-osd-operator/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@ updates:
labels:
- "area/dependency"
- "ok-to-test"
- "lgtm"
- "approved"
schedule:
interval: "weekly"
day: "monday"
time: "03:00"
timezone: "UTC"
ignore:
- dependency-name: "redhat-services-prod/openshift/boilerplate"
# don't upgrade boilerplate via these means
Expand Down