diff options
| author | Đoàn Trần Công Danh <congdanhqx@gmail.com> | 2020-04-04 08:08:48 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-06 13:44:42 -0700 |
| commit | 5a33f541ddb52e3f45db87db7c3dd40945b9a564 (patch) | |
| tree | a36a58582b0e0f6461944558b99b70e89d9963dc /ci | |
| parent | 2bd1e2d273b69516a3c161671a39263589ccc9fc (diff) | |
| download | git-5a33f541ddb52e3f45db87db7c3dd40945b9a564.tar.gz | |
ci: refactor docker runner script
We will support alpine check in docker later in this series.
While we're at it, tell people to run as root in podman,
if podman is used as drop-in replacement for docker,
because podman will map host-user to container's root,
therefore, mapping their permission.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/run-docker-build.sh (renamed from ci/run-linux32-build.sh) | 6 | ||||
| -rwxr-xr-x | ci/run-docker.sh (renamed from ci/run-linux32-docker.sh) | 22 |
2 files changed, 19 insertions, 9 deletions
diff --git a/ci/run-linux32-build.sh b/ci/run-docker-build.sh index 44bb332f64..a05b48c559 100755 --- a/ci/run-linux32-build.sh +++ b/ci/run-docker-build.sh @@ -1,16 +1,16 @@ #!/bin/sh # -# Build and test Git in a 32-bit environment +# Build and test Git inside container # # Usage: -# run-linux32-build.sh <host-user-id> +# run-docker-build.sh <host-user-id> # set -ex if test $# -ne 1 || test -z "$1" then - echo >&2 "usage: run-linux32-build.sh <host-user-id>" + echo >&2 "usage: run-docker-build.sh <host-user-id>" exit 1 fi diff --git a/ci/run-linux32-docker.sh b/ci/run-docker.sh index 54186b6aa7..3881f99b53 100755 --- a/ci/run-linux32-docker.sh +++ b/ci/run-docker.sh @@ -1,16 +1,26 @@ #!/bin/sh # -# Download and run Docker image to build and test 32-bit Git +# Download and run Docker image to build and test Git # . ${0%/*}/lib.sh -docker pull daald/ubuntu32:xenial +case "$jobname" in +Linux32) + CI_CONTAINER="daald/ubuntu32:xenial" + ;; +*) + exit 1 + ;; +esac + +docker pull "$CI_CONTAINER" # Use the following command to debug the docker build locally: -# $ docker run -itv "${PWD}:/usr/src/git" --entrypoint /bin/bash daald/ubuntu32:xenial +# <host-user-id> must be 0 if podman is used as drop-in replacement for docker +# $ docker run -itv "${PWD}:/usr/src/git" --entrypoint /bin/sh "$CI_CONTAINER" # root@container:/# export jobname=<jobname> -# root@container:/# /usr/src/git/ci/run-linux32-build.sh <host-user-id> +# root@container:/# /usr/src/git/ci/run-docker-build.sh <host-user-id> container_cache_dir=/tmp/travis-cache @@ -26,8 +36,8 @@ docker run \ --env cache_dir="$container_cache_dir" \ --volume "${PWD}:/usr/src/git" \ --volume "$cache_dir:$container_cache_dir" \ - daald/ubuntu32:xenial \ - /usr/src/git/ci/run-linux32-build.sh $(id -u $USER) + "$CI_CONTAINER" \ + /usr/src/git/ci/run-docker-build.sh $(id -u $USER) check_unignored_build_artifacts |