Skip to content

Fix / clean up repo-docker-run.sh #3654

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Apr 22, 2025
Merged

Fix / clean up repo-docker-run.sh #3654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5073cce
repo-docker-run.sh: Replace readlink with realpath
michi-covalent Apr 19, 2025
27b017e
repo-docker-run.sh: Fix MAIN_DIR
michi-covalent Apr 19, 2025
0153eb1
repo-docker-run.sh: Don't unnecessarily mount .git
michi-covalent Apr 19, 2025
8886819
repo-docker-run.sh: Allow overriding container engine
michi-covalent Apr 19, 2025
cec7520
api: Clean up Makefile
michi-covalent Apr 20, 2025
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
8 changes: 3 additions & 5 deletions api/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,22 @@ __check-breaking_local:

.PHONY: proto lint format check-breaking
all proto lint format check-breaking:
../contrib/scripts/repo-docker-run.sh --rm \
../contrib/scripts/repo-docker-run.sh \
--volume $(CURDIR)/..:/src \
--workdir /src/api \
--user "$(shell id -u):$(shell id -g)" \
$(BUILDER_IMAGE) \
make -C /src/api __$@_local BUF_BREAKING_AGAINST_BRANCH=$(BUF_BREAKING_AGAINST_BRANCH)

.PHONY: debug
debug:
@echo ../contrib/scripts/repo-docker-run.sh --rm \
@echo ../contrib/scripts/repo-docker-run.sh \
--volume $(CURDIR)/..:/src \
--workdir /src/api \
--user "$(shell id -u):$(shell id -g)" \
$(BUILDER_IMAGE) \
buf $(EXTRA_BUF_FLAGS)

.PHONY: vendor
vendor:
$(GO) mod tidy
$(GO) mod vendor
$(GO) mod verify
$(GO) mod verify
16 changes: 9 additions & 7 deletions contrib/scripts/repo-docker-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#
# See: https://github.com/buildroot/buildroot/blob/master/utils/docker-run


CONTAINER_ENGINE="${CONTAINER_ENGINE:-docker}"
DIR=$(dirname "${0}")
MAIN_DIR=$(readlink -f "${DIR}/..")
MAIN_DIR=$(realpath "${DIR}/../..")
if [ -L "${MAIN_DIR}/.git/config" ]; then
# Support git-new-workdir
GIT_DIR="$(dirname "$(realpath "${MAIN_DIR}/.git/config")")"
Expand All @@ -24,19 +24,21 @@ declare -a mountpoints=(
# to know about worktrees, so we're not in a worktree either. So it means
# we're in the main git working copy, and thus we don't need to mount the
# .git directory.
if [ "${GIT_DIR}" ]; then
# If GID_DIR is ".git", then we are in the main git working copy, and ".git"
# directory will be included in the main Docker volume.
if [[ "${GIT_DIR}" && "${GIT_DIR}" != ".git" ]]; then
# GIT_DIR in the main working copy (when git supports worktrees) will
# be just '.git', but 'docker run' needs an absolute path. If it is
# not absolute, GIT_DIR is relative to MAIN_DIR. If it's an absolute
# path already (in a wordir), then that's a noop.
GIT_DIR="$(cd "${MAIN_DIR}"; readlink -e "${GIT_DIR}")"
GIT_DIR="$(cd "${MAIN_DIR}"; realpath "${GIT_DIR}")"
mountpoints+=( "${GIT_DIR}" )

# 'repo' stores .git/objects separately.
if [ -L "${GIT_DIR}/objects" ]; then
# GITDIR is already an absolute path, but for symetry
# with the above, keep the same cd+readlink construct.
OBJECTS_DIR="$(cd "${MAIN_DIR}"; readlink -e "${GIT_DIR}/objects")"
# with the above, keep the same cd+realpath construct.
OBJECTS_DIR="$(cd "${MAIN_DIR}"; realpath "${GIT_DIR}/objects")"
mountpoints+=( "${OBJECTS_DIR}" )
fi
fi
Expand All @@ -51,4 +53,4 @@ for dir in $(printf '%s\n' "${mountpoints[@]}" |LC_ALL=C sort -u); do
docker_opts+=( --mount "type=bind,src=${dir},dst=${dir}" )
done

docker run "${docker_opts[@]}" "${@}"
"${CONTAINER_ENGINE}" run "${docker_opts[@]}" "${@}"
Loading