On Thu, Mar 26, 2020 at 02:35:18PM +0700, Đoàn Trần Công Danh wrote:
> We will support alpine check in docker later in this serie.
>
> While we're at it, tell people to run as root in podman.
Why tell that to people? Please clarify what podman is and why should
we care.
> Signed-off-by: Đoàn Trần Công Danh <congdanhqx@xxxxxxxxx>
> ---
> .travis.yml | 2 +-
> azure-pipelines.yml | 4 ++--
> ci/{run-linux32-docker.sh => run-docker.sh} | 19 +++++++++++++------
> 3 files changed, 16 insertions(+), 9 deletions(-)
> rename ci/{run-linux32-docker.sh => run-docker.sh} (48%)
>
> diff --git a/.travis.yml b/.travis.yml
> index fc5730b085..32e80e2670 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -32,7 +32,7 @@ matrix:
> services:
> - docker
> before_install:
> - script: ci/run-linux32-docker.sh
> + script: ci/run-docker.sh linux32
The name of the 'Linux32' build job starts with a capital 'L'; please
be consistent with that.
> - env: jobname=StaticAnalysis
> os: linux
> compiler:
> diff --git a/azure-pipelines.yml b/azure-pipelines.yml
> index 675c3a43c9..ef504ff29f 100644
> --- a/azure-pipelines.yml
> +++ b/azure-pipelines.yml
> @@ -489,14 +489,14 @@ jobs:
> test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
>
> res=0
> - sudo AGENT_OS="$AGENT_OS" BUILD_BUILDNUMBER="$BUILD_BUILDNUMBER" BUILD_REPOSITORY_URI="$BUILD_REPOSITORY_URI" BUILD_SOURCEBRANCH="$BUILD_SOURCEBRANCH" BUILD_SOURCEVERSION="$BUILD_SOURCEVERSION" SYSTEM_PHASENAME="$SYSTEM_PHASENAME" SYSTEM_TASKDEFINITIONSURI="$SYSTEM_TASKDEFINITIONSURI" SYSTEM_TEAMPROJECT="$SYSTEM_TEAMPROJECT" CC=$CC MAKEFLAGS="$MAKEFLAGS" bash -lxc ci/run-linux32-docker.sh || res=1
> + sudo AGENT_OS="$AGENT_OS" BUILD_BUILDNUMBER="$BUILD_BUILDNUMBER" BUILD_REPOSITORY_URI="$BUILD_REPOSITORY_URI" BUILD_SOURCEBRANCH="$BUILD_SOURCEBRANCH" BUILD_SOURCEVERSION="$BUILD_SOURCEVERSION" SYSTEM_PHASENAME="$SYSTEM_PHASENAME" SYSTEM_TASKDEFINITIONSURI="$SYSTEM_TASKDEFINITIONSURI" SYSTEM_TEAMPROJECT="$SYSTEM_TEAMPROJECT" CC=$CC MAKEFLAGS="$MAKEFLAGS" bash -lxc ci/run-docker.sh linux32 || res=1
>
> sudo chmod a+r t/out/TEST-*.xml
> test ! -d t/failed-test-artifacts || sudo chmod a+r t/failed-test-artifacts
>
> test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || res=1
> exit $res
> - displayName: 'ci/run-linux32-docker.sh'
> + displayName: 'ci/run-docker.sh linux32'
> env:
> GITFILESHAREPWD: $(gitfileshare.pwd)
> - task: PublishTestResults@2
> diff --git a/ci/run-linux32-docker.sh b/ci/run-docker.sh
> similarity index 48%
> rename from ci/run-linux32-docker.sh
> rename to ci/run-docker.sh
> index 751acfcf8a..c8dff9d41a 100755
> --- a/ci/run-linux32-docker.sh
> +++ b/ci/run-docker.sh
> @@ -1,15 +1,22 @@
> #!/bin/sh
> #
> -# Download and run Docker image to build and test 32-bit Git
> +# Download and run Docker image to build and test git
s/git/Git/
> #
>
> . ${0%/*}/lib.sh
>
> -docker pull daald/ubuntu32:xenial
> +CI_TARGET=${1:-linux32}
> +case "$CI_TARGET" 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
> -# root@container:/# /usr/src/git/ci/run-linux32-build.sh <host-user-id>
> +# <host-user-id> must be 0 if podman is used in place of docker
> +# $ docker run -itv "${PWD}:/usr/src/git" --entrypoint /bin/sh "$CI_CONTAINER"
> +# root@container:/# /usr/src/git/ci/run-$CI_TARGET-build.sh <host-user-id>
>
> container_cache_dir=/tmp/travis-cache
>
> @@ -23,8 +30,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-$CI_TARGET-build.sh" $(id -u $USER)
>
> check_unignored_build_artifacts
>
> --
> 2.26.0.rc2.357.g1e1ba0441d
>
