File tree Expand file tree Collapse file tree 3 files changed +8
-5
lines changed Expand file tree Collapse file tree 3 files changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ _ORIGIN=$(pwd)
7
7
rm -rf /tmp/sentry-self-hosted-test-sandbox.*
8
8
_SANDBOX=" $( mktemp -d /tmp/sentry-self-hosted-test-sandbox.XXX) "
9
9
10
+ source install/detect-container-engine.sh
10
11
source install/detect-platform.sh
11
12
docker build -t sentry-self-hosted-jq-local --platform=" $DOCKER_PLATFORM " jq
12
13
Original file line number Diff line number Diff line change 1
1
echo " ${_group} Detecting container engine ..."
2
2
3
- export CONTAINER_ENGINE=" "
4
-
5
- if command -v podman & > /dev/null; then
6
- CONTAINER_ENGINE=" podman"
3
+ if [[ " ${CONTAINER_ENGINE_PODMAN:- 0} " -eq 1 ]] && command -v podman & > /dev/null; then
4
+ export CONTAINER_ENGINE=" podman"
7
5
elif command -v docker & > /dev/null; then
8
- CONTAINER_ENGINE=" docker"
6
+ export CONTAINER_ENGINE=" docker"
9
7
else
10
8
echo " FAIL: Neither podman nor docker is installed on the system."
11
9
exit 1
Original file line number Diff line number Diff line change @@ -29,6 +29,8 @@ Options:
29
29
--no-report-self-hosted-issues
30
30
Do not report error and performance data about your
31
31
self-hosted instance upstream to Sentry.
32
+ --container-engine-podman
33
+ Use podman as the container engine.
32
34
EOF
33
35
}
34
36
@@ -46,6 +48,7 @@ MINIMIZE_DOWNTIME="${MINIMIZE_DOWNTIME:-}"
46
48
SKIP_COMMIT_CHECK=" ${SKIP_COMMIT_CHECK:- } "
47
49
REPORT_SELF_HOSTED_ISSUES=" ${REPORT_SELF_HOSTED_ISSUES:- } "
48
50
SKIP_SSE42_REQUIREMENTS=" ${SKIP_SSE42_REQUIREMENTS:- } "
51
+ CONTAINER_ENGINE_PODMAN=" ${CONTAINER_ENGINE_PODMAN:- } "
49
52
50
53
while (( $# )) ; do
51
54
case " $1 " in
@@ -67,6 +70,7 @@ while (($#)); do
67
70
--report-self-hosted-issues) REPORT_SELF_HOSTED_ISSUES=1 ;;
68
71
--no-report-self-hosted-issues) REPORT_SELF_HOSTED_ISSUES=0 ;;
69
72
--skip-sse42-requirements) SKIP_SSE42_REQUIREMENTS=1 ;;
73
+ --container-engine-podman) CONTAINER_ENGINE_PODMAN=1 ;;
70
74
--) ;;
71
75
* )
72
76
echo " Unexpected argument: $1 . Use --help for usage information."
You can’t perform that action at this time.
0 commit comments