diff options
Diffstat (limited to 'tools/ci-install.sh')
| -rwxr-xr-x | tools/ci-install.sh | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/tools/ci-install.sh b/tools/ci-install.sh index b259a58e..0637ea87 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -32,20 +32,13 @@ NULL= # Typical values: auto, ubuntu, debian, ; maybe fedora in future : "${ci_distro:=auto}" -# ci_docker: -# If non-empty, this is the name of a Docker image. ci-install.sh will -# fetch it with "docker pull" and use it as a base for a new Docker image -# named "ci-image" in which we will do our testing. -: "${ci_docker:=}" - # ci_host: # Either "native", or an Autoconf --host argument to cross-compile # the package : "${ci_host:=native}" # ci_in_docker: -# Used internally by ci-install.sh. If yes, we are inside the Docker image -# (ci_docker is empty in this case). +# "yes" if we are running inside a Docker image. : "${ci_in_docker:=no}" # ci_local_packages: @@ -61,7 +54,7 @@ NULL= # One of debug, reduced, legacy, production : "${ci_variant:=production}" -echo "ci_distro=$ci_distro ci_docker=$ci_docker ci_in_docker=$ci_in_docker ci_host=$ci_host ci_local_packages=$ci_local_packages ci_suite=$ci_suite ci_variant=$ci_variant $0" +echo "ci_distro=$ci_distro ci_in_docker=$ci_in_docker ci_host=$ci_host ci_local_packages=$ci_local_packages ci_suite=$ci_suite ci_variant=$ci_variant $0" if [ $(id -u) = 0 ]; then sudo= @@ -82,15 +75,6 @@ if [ "$ci_suite" = "auto" ]; then echo "detected ci_suite as '${ci_suite}'" fi -if [ -n "$ci_docker" ]; then - sed \ - -e "s/@ci_distro@/${ci_distro}/" \ - -e "s/@ci_docker@/${ci_docker}/" \ - -e "s/@ci_suite@/${ci_suite}/" \ - < tools/ci-Dockerfile.in > Dockerfile - exec docker build -t ci-image . -fi - case "$ci_distro" in (debian*|ubuntu*) # Don't ask questions, just do it @@ -406,11 +390,6 @@ if [ "$ci_local_packages" = yes ]; then wget ${mirror}/${filename} tar -C ${dep_prefix} --strip-components=1 -xvf ${filename} done - - # limit access rights - if [ "$ci_in_docker" = yes ]; then - chown -R user "${dep_prefix}" - fi ;; esac fi |