diff --git a/.env b/.env index 1682d1d47465f..cf3e6331e2c43 100644 --- a/.env +++ b/.env @@ -29,44 +29,55 @@ DOCKER_VOLUME_PREFIX= # turn on inline build cache, this is a docker buildx feature documented # at https://github.com/docker/buildx#--cache-tonametypetypekeyvalue +BUILDKIT_INLINE_CACHE=1 COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 -BUILDKIT_INLINE_CACHE=1 # different architecture notations ARCH=amd64 ARCH_ALIAS=x86_64 ARCH_SHORT=amd64 -ULIMIT_CORE=-1 +# Default repository to pull and push images from REPO=apache/arrow-dev -CUDA=9.1 + +# The setup attempts to generate coredumps by default, in order to disable the +# coredump generation set it to 0 +ULIMIT_CORE=-1 + +# Default versions for platforms DEBIAN=11 -UBUNTU=20.04 FEDORA=33 -PYTHON=3.6 -LLVM=12 +UBUNTU=20.04 + +# Default versions for various dependencies CLANG_TOOLS=8 +CUDA=9.1 +DASK=latest +DOTNET=3.1 +GCC_VERSION="" GO=1.15 -NODE=14 -MAVEN=3.5.4 +HDFS=3.2.1 JDK=8 +KARTOTHEK=latest +LLVM=12 +MAVEN=3.5.4 +NODE=14 NUMPY=latest PANDAS=latest -DASK=latest -TURBODBC=latest -KARTOTHEK=latest -HDFS=3.2.1 -SPARK=master -DOTNET=3.1 +PYTHON=3.6 R=4.1 -ARROW_R_DEV=TRUE -GCC_VERSION="" +SPARK=master +TURBODBC=latest + # These correspond to images on Docker Hub that contain R, e.g. rhub/ubuntu-gcc-release:latest -R_ORG=rhub +ARROW_R_DEV=TRUE R_IMAGE=ubuntu-gcc-release +R_ORG=rhub +R_PRUNE_DEPS=FALSE R_TAG=latest TZ=UTC + # -1 does not attempt to install a devtoolset version, any positive integer will install devtoolset-n DEVTOOLSET_VERSION=-1 diff --git a/ci/appveyor-cpp-setup.bat b/ci/appveyor-cpp-setup.bat index cee9bc28e5fb8..00f4dff0ac9c4 100644 --- a/ci/appveyor-cpp-setup.bat +++ b/ci/appveyor-cpp-setup.bat @@ -43,6 +43,11 @@ conda config --set remote_connect_timeout_secs 12 conda config --append disallowed_packages pypy3 conda info -a +@rem +@rem Install mamba to the base environment +@rem +conda install -q -y -c conda-forge mamba + @rem @rem Create conda environment for Build and Toolchain jobs @rem @@ -60,7 +65,7 @@ if "%JOB%" == "Toolchain" ( ) if "%JOB%" NEQ "Build_Debug" ( @rem Arrow conda environment is only required for the Build and Toolchain jobs - conda create -n arrow -q -y -c conda-forge ^ + mamba create -n arrow -q -y -c conda-forge ^ --file=ci\conda_env_python.txt ^ %CONDA_PACKAGES% ^ "cmake=3.17" ^ @@ -74,7 +79,7 @@ if "%JOB%" NEQ "Build_Debug" ( @rem On Windows, GTest is always bundled from source instead of using @rem conda binaries, avoid any interference between the two versions. if "%JOB%" == "Toolchain" ( - conda uninstall -n arrow -q -y -c conda-forge gtest + mamba uninstall -n arrow -q -y -c conda-forge gtest ) ) diff --git a/ci/docker/conda-cpp.dockerfile b/ci/docker/conda-cpp.dockerfile index 40a855b5dd277..8fd5e46fd6da0 100644 --- a/ci/docker/conda-cpp.dockerfile +++ b/ci/docker/conda-cpp.dockerfile @@ -19,17 +19,23 @@ ARG repo ARG arch FROM ${repo}:${arch}-conda +COPY ci/scripts/install_minio.sh /arrow/ci/scripts +RUN /arrow/ci/scripts/install_minio.sh latest /opt/conda + +COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts +RUN /arrow/ci/scripts/install_gcs_testbench.sh default + # install the required conda packages into the test environment COPY ci/conda_env_cpp.txt \ ci/conda_env_gandiva.txt \ /arrow/ci/ -RUN conda install \ +RUN mamba install \ --file arrow/ci/conda_env_cpp.txt \ --file arrow/ci/conda_env_gandiva.txt \ compilers \ doxygen \ valgrind && \ - conda clean --all + mamba clean --all ENV ARROW_BUILD_TESTS=ON \ ARROW_DATASET=ON \ diff --git a/ci/docker/conda-integration.dockerfile b/ci/docker/conda-integration.dockerfile index d40973330a6da..378fe71df7009 100644 --- a/ci/docker/conda-integration.dockerfile +++ b/ci/docker/conda-integration.dockerfile @@ -27,7 +27,7 @@ ARG go=1.15 # Install Archery and integration dependencies COPY ci/conda_env_archery.txt /arrow/ci/ -RUN conda install -q \ +RUN mamba install -q \ --file arrow/ci/conda_env_archery.txt \ "python>=3.7" \ numpy \ @@ -36,7 +36,7 @@ RUN conda install -q \ nodejs=${node} \ yarn \ openjdk=${jdk} && \ - conda clean --all --force-pkgs-dirs + mamba clean --all --force-pkgs-dirs # Install Rust with only the needed components # (rustfmt is needed for tonic-build to compile the protobuf definitions) diff --git a/ci/docker/conda-python-hdfs.dockerfile b/ci/docker/conda-python-hdfs.dockerfile index f6ffc71ce6254..65a1befa64c1d 100644 --- a/ci/docker/conda-python-hdfs.dockerfile +++ b/ci/docker/conda-python-hdfs.dockerfile @@ -22,11 +22,11 @@ FROM ${repo}:${arch}-conda-python-${python} ARG jdk=8 ARG maven=3.5 -RUN conda install -q \ +RUN mamba install -q \ maven=${maven} \ openjdk=${jdk} \ pandas && \ - conda clean --all + mamba clean --all # installing libhdfs (JNI) ARG hdfs=3.2.1 diff --git a/ci/docker/conda-python-jpype.dockerfile b/ci/docker/conda-python-jpype.dockerfile index f77ef9bf66b45..005007e2c4dd2 100644 --- a/ci/docker/conda-python-jpype.dockerfile +++ b/ci/docker/conda-python-jpype.dockerfile @@ -22,8 +22,8 @@ FROM ${repo}:${arch}-conda-python-${python} ARG jdk=11 ARG maven=3.6 -RUN conda install -q \ +RUN mamba install -q \ maven=${maven} \ openjdk=${jdk} \ jpype1 && \ - conda clean --all + mamba clean --all diff --git a/ci/docker/conda-python-kartothek.dockerfile b/ci/docker/conda-python-kartothek.dockerfile index e95c1e7f67867..77dd1f5214f33 100644 --- a/ci/docker/conda-python-kartothek.dockerfile +++ b/ci/docker/conda-python-kartothek.dockerfile @@ -21,7 +21,7 @@ ARG python=3.6 FROM ${repo}:${arch}-conda-python-${python} # install kartothek dependencies from conda-forge -RUN conda install -c conda-forge -q \ +RUN mamba install -c conda-forge -q \ attrs \ click \ cloudpickle \ @@ -40,7 +40,7 @@ RUN conda install -c conda-forge -q \ toolz \ urlquote \ zstandard && \ - conda clean --all + mamba clean --all ARG kartothek=latest COPY ci/scripts/install_kartothek.sh /arrow/ci/scripts/ diff --git a/ci/docker/conda-python-pandas.dockerfile b/ci/docker/conda-python-pandas.dockerfile index 303cc80e48a07..9f1ba099116a8 100644 --- a/ci/docker/conda-python-pandas.dockerfile +++ b/ci/docker/conda-python-pandas.dockerfile @@ -23,5 +23,5 @@ FROM ${repo}:${arch}-conda-python-${python} ARG pandas=latest ARG numpy=latest COPY ci/scripts/install_pandas.sh /arrow/ci/scripts/ -RUN conda uninstall -q -y numpy && \ +RUN mamba uninstall -q -y numpy && \ /arrow/ci/scripts/install_pandas.sh ${pandas} ${numpy} diff --git a/ci/docker/conda-python-spark.dockerfile b/ci/docker/conda-python-spark.dockerfile index a2af2ac135c99..233a1fc363f09 100644 --- a/ci/docker/conda-python-spark.dockerfile +++ b/ci/docker/conda-python-spark.dockerfile @@ -23,11 +23,11 @@ FROM ${repo}:${arch}-conda-python-${python} ARG jdk=8 ARG maven=3.5 -RUN conda install -q \ +RUN mamba install -q \ openjdk=${jdk} \ maven=${maven} \ pandas && \ - conda clean --all + mamba clean --all # installing specific version of spark ARG spark=master diff --git a/ci/docker/conda-python-turbodbc.dockerfile b/ci/docker/conda-python-turbodbc.dockerfile index e748604dee3f0..e702cd1352429 100644 --- a/ci/docker/conda-python-turbodbc.dockerfile +++ b/ci/docker/conda-python-turbodbc.dockerfile @@ -30,12 +30,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ rm -rf /var/lib/apt/lists/* # install turbodbc dependencies from conda-forge -RUN conda install -c conda-forge -q \ +RUN mamba install -c conda-forge -q \ pybind11 \ pytest-cov \ mock \ unixodbc && \ - conda clean --all + mamba clean --all RUN service postgresql start && \ sudo -u postgres psql -U postgres -c \ diff --git a/ci/docker/conda-python.dockerfile b/ci/docker/conda-python.dockerfile index ab3f77be1b678..3749372e4f4ef 100644 --- a/ci/docker/conda-python.dockerfile +++ b/ci/docker/conda-python.dockerfile @@ -22,12 +22,12 @@ FROM ${repo}:${arch}-conda-cpp # install python specific packages ARG python=3.6 COPY ci/conda_env_python.txt /arrow/ci/ -RUN conda install -q \ +RUN mamba install -q \ --file arrow/ci/conda_env_python.txt \ $([ "$python" == "3.6" -o "$python" == "3.7" ] && echo "pickle5") \ python=${python} \ nomkl && \ - conda clean --all + mamba clean --all ENV ARROW_PYTHON=ON \ ARROW_BUILD_STATIC=OFF \ diff --git a/ci/docker/conda.dockerfile b/ci/docker/conda.dockerfile index adb64f9fad00c..d0545e3bf845f 100644 --- a/ci/docker/conda.dockerfile +++ b/ci/docker/conda.dockerfile @@ -18,10 +18,6 @@ ARG arch=amd64 FROM ${arch}/ubuntu:18.04 -# arch is unset after the FROM statement, so need to define it again -ARG arch=amd64 -ARG prefix=/opt/conda - # install build essentials RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update -y -q && \ @@ -29,27 +25,22 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -ENV PATH=${prefix}/bin:$PATH -# install conda and minio -COPY ci/scripts/install_conda.sh \ - ci/scripts/install_minio.sh \ - /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_conda.sh ${arch} linux latest ${prefix} -RUN /arrow/ci/scripts/install_minio.sh ${arch} linux latest ${prefix} -COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts -RUN /arrow/ci/scripts/install_gcs_testbench.sh ${arch} default +# install conda and mamba via mambaforge +COPY ci/scripts/install_conda.sh /arrow/ci/scripts/ +RUN /arrow/ci/scripts/install_conda.sh mambaforge latest /opt/conda +ENV PATH=/opt/conda/bin:$PATH # create a conda environment ADD ci/conda_env_unix.txt /arrow/ci/ -RUN conda create -n arrow --file arrow/ci/conda_env_unix.txt git && \ - conda clean --all +RUN mamba create -n arrow --file arrow/ci/conda_env_unix.txt git && \ + mamba clean --all # activate the created environment by default RUN echo "conda activate arrow" >> ~/.profile -ENV CONDA_PREFIX=${prefix}/envs/arrow +ENV CONDA_PREFIX=/opt/conda/envs/arrow # use login shell to activate arrow environment un the RUN commands -SHELL [ "/bin/bash", "-c", "-l" ] +SHELL ["/bin/bash", "-c", "-l"] # use login shell when running the container -ENTRYPOINT [ "/bin/bash", "-c", "-l" ] +ENTRYPOINT ["/bin/bash", "-c", "-l"] diff --git a/ci/docker/debian-10-cpp.dockerfile b/ci/docker/debian-10-cpp.dockerfile index f85408f03489a..7f28c3b546221 100644 --- a/ci/docker/debian-10-cpp.dockerfile +++ b/ci/docker/debian-10-cpp.dockerfile @@ -17,7 +17,6 @@ ARG arch=amd64 FROM ${arch}/debian:10 -ARG arch ENV DEBIAN_FRONTEND noninteractive @@ -73,7 +72,7 @@ RUN apt-get update -y -q && \ rm -rf /var/lib/apt/lists/* COPY ci/scripts/install_minio.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_minio.sh ${arch} linux latest /usr/local +RUN /arrow/ci/scripts/install_minio.sh latest /usr/local ENV ARROW_BUILD_TESTS=ON \ ARROW_DATASET=ON \ diff --git a/ci/docker/debian-11-cpp.dockerfile b/ci/docker/debian-11-cpp.dockerfile index 659881b0c8b92..bbc1e1ec05a83 100644 --- a/ci/docker/debian-11-cpp.dockerfile +++ b/ci/docker/debian-11-cpp.dockerfile @@ -71,9 +71,10 @@ RUN apt-get update -y -q && \ rm -rf /var/lib/apt/lists/* COPY ci/scripts/install_minio.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_minio.sh ${arch} linux latest /usr/local +RUN /arrow/ci/scripts/install_minio.sh latest /usr/local + COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_gcs_testbench.sh ${arch} default +RUN /arrow/ci/scripts/install_gcs_testbench.sh default ENV ARROW_BUILD_TESTS=ON \ ARROW_DATASET=ON \ diff --git a/ci/docker/fedora-33-cpp.dockerfile b/ci/docker/fedora-33-cpp.dockerfile index 61964a476e977..a60a572ec3aef 100644 --- a/ci/docker/fedora-33-cpp.dockerfile +++ b/ci/docker/fedora-33-cpp.dockerfile @@ -64,9 +64,10 @@ RUN dnf update -y && \ zlib-devel COPY ci/scripts/install_minio.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_minio.sh ${arch} linux latest /usr/local +RUN /arrow/ci/scripts/install_minio.sh latest /usr/local + COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_gcs_testbench.sh ${arch} default +RUN /arrow/ci/scripts/install_gcs_testbench.sh default ENV ARROW_BUILD_TESTS=ON \ ARROW_DEPENDENCY_SOURCE=SYSTEM \ diff --git a/ci/docker/linux-apt-r.dockerfile b/ci/docker/linux-apt-r.dockerfile index 1ccf660c86933..8e290dc00e026 100644 --- a/ci/docker/linux-apt-r.dockerfile +++ b/ci/docker/linux-apt-r.dockerfile @@ -17,7 +17,6 @@ ARG base FROM ${base} -ARG arch ARG tz="UTC" ENV TZ=${tz} @@ -92,9 +91,10 @@ COPY r/DESCRIPTION /arrow/r/ RUN /arrow/ci/scripts/r_deps.sh /arrow COPY ci/scripts/install_minio.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_minio.sh ${arch} linux latest /usr/local +RUN /arrow/ci/scripts/install_minio.sh latest /usr/local + COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_gcs_testbench.sh ${arch} default +RUN /arrow/ci/scripts/install_gcs_testbench.sh default COPY python/requirements-build.txt /arrow/python/ RUN pip install -r arrow/python/requirements-build.txt diff --git a/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile b/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile index d7076b45bab24..f6ca61905598b 100644 --- a/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile +++ b/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile @@ -17,7 +17,6 @@ ARG base=amd64/ubuntu:20.04 FROM ${base} -ARG arch SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -38,9 +37,10 @@ RUN apt-get update -y -q && \ rm -rf /var/lib/apt/lists* COPY ci/scripts/install_minio.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_minio.sh ${arch} linux latest /usr/local +RUN /arrow/ci/scripts/install_minio.sh latest /usr/local + COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_gcs_testbench.sh ${arch} default +RUN /arrow/ci/scripts/install_gcs_testbench.sh default ENV ARROW_BUILD_TESTS=ON \ ARROW_DATASET=ON \ diff --git a/ci/docker/ubuntu-20.04-cpp.dockerfile b/ci/docker/ubuntu-20.04-cpp.dockerfile index 5a48c648e3bfe..c50f71bc91379 100644 --- a/ci/docker/ubuntu-20.04-cpp.dockerfile +++ b/ci/docker/ubuntu-20.04-cpp.dockerfile @@ -17,7 +17,6 @@ ARG base=amd64/ubuntu:20.04 FROM ${base} -ARG arch SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -99,9 +98,11 @@ RUN apt-get update -y -q && \ rm -rf /var/lib/apt/lists* COPY ci/scripts/install_minio.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_minio.sh ${arch} linux latest /usr/local +RUN /arrow/ci/scripts/install_minio.sh latest /usr/local + COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_gcs_testbench.sh ${arch} default +RUN /arrow/ci/scripts/install_gcs_testbench.sh default + COPY ci/scripts/install_ceph.sh /arrow/ci/scripts/ RUN /arrow/ci/scripts/install_ceph.sh diff --git a/ci/docker/ubuntu-21.04-cpp.dockerfile b/ci/docker/ubuntu-21.04-cpp.dockerfile index 9fc857c626601..2017d26b5bd6d 100644 --- a/ci/docker/ubuntu-21.04-cpp.dockerfile +++ b/ci/docker/ubuntu-21.04-cpp.dockerfile @@ -17,7 +17,6 @@ ARG base=amd64/ubuntu:20.04 FROM ${base} -ARG arch SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -96,9 +95,10 @@ RUN apt-get update -y -q && \ rm -rf /var/lib/apt/lists* COPY ci/scripts/install_minio.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_minio.sh ${arch} linux latest /usr/local +RUN /arrow/ci/scripts/install_minio.sh latest /usr/local + COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/ -RUN /arrow/ci/scripts/install_gcs_testbench.sh ${arch} default +RUN /arrow/ci/scripts/install_gcs_testbench.sh default # Prioritize system packages and local installation # The following dependencies will be downloaded due to missing/invalid packages diff --git a/ci/scripts/install_conda.sh b/ci/scripts/install_conda.sh index f4d313b63dfb3..2e86416302269 100755 --- a/ci/scripts/install_conda.sh +++ b/ci/scripts/install_conda.sh @@ -19,48 +19,30 @@ set -e -declare -A archs -archs=([amd64]=x86_64 - [arm32v7]=armv7l - [ppc64le]=ppc64le - [i386]=x86) - -declare -A platforms -platforms=([windows]=Windows - [macos]=MacOSX - [linux]=Linux) - -if [ "$#" -ne 4 ]; then - echo "Usage: $0 " - exit 1 -elif [[ -z ${archs[$1]} ]]; then - echo "Unexpected architecture: ${1}" - exit 1 -elif [[ -z ${platforms[$2]} ]]; then - echo "Unexpected platform: ${2}" +if [ "$#" -ne 3 ]; then + echo "Usage: $0 " exit 1 fi -arch=${archs[$1]} -platform=${platforms[$2]} -version=$3 -prefix=$4 +arch=$(uname -m) +platform=$(uname) +installer=$1 +version=$2 +prefix=$3 echo "Downloading Miniconda installer..." -wget -nv https://repo.continuum.io/miniconda/Miniconda3-${version}-${platform}-${arch}.sh -O /tmp/miniconda.sh -bash /tmp/miniconda.sh -b -p ${prefix} -rm /tmp/miniconda.sh +wget -nv https://github.com/conda-forge/miniforge/releases/latest/download/${installer^}-${platform}-${arch}.sh -O /tmp/installer.sh +bash /tmp/installer.sh -b -p ${prefix} +rm /tmp/installer.sh # Like "conda init", but for POSIX sh rather than bash ln -s ${prefix}/etc/profile.d/conda.sh /etc/profile.d/conda.sh +export PATH=/opt/conda/bin:$PATH + # Configure -source /etc/profile.d/conda.sh -conda config --add channels conda-forge -conda config --set channel_priority strict conda config --set show_channel_urls True conda config --set remote_connect_timeout_secs 12 # Update and clean -conda update --all -y conda clean --all -y diff --git a/ci/scripts/install_dask.sh b/ci/scripts/install_dask.sh index 954ce3249d9de..ff0def006a832 100755 --- a/ci/scripts/install_dask.sh +++ b/ci/scripts/install_dask.sh @@ -29,8 +29,7 @@ dask=$1 if [ "${dask}" = "master" ]; then pip install https://github.com/dask/dask/archive/main.tar.gz#egg=dask[dataframe] elif [ "${dask}" = "latest" ]; then - conda install -q dask + pip install dask else - conda install -q dask=${dask} + pip install dask==${dask} fi -conda clean --all diff --git a/ci/scripts/install_gcs_testbench.sh b/ci/scripts/install_gcs_testbench.sh index 579a78944b5ca..16e3c4042cf97 100755 --- a/ci/scripts/install_gcs_testbench.sh +++ b/ci/scripts/install_gcs_testbench.sh @@ -19,18 +19,17 @@ set -e -if [ "$#" -ne 2 ]; then - echo "Usage: $0 " +if [ "$#" -ne 1 ]; then + echo "Usage: $0 " exit 1 fi -arch=$1 -if [ "${arch}" != "amd64" ]; then +if [ "$(uname -m)" != "x86_64" ]; then echo "GCS testbench won't install on non-x86 architecture" exit 0 fi -version=$2 +version=$1 if [[ "${version}" -eq "default" ]]; then version="v0.7.0" fi diff --git a/ci/scripts/install_minio.sh b/ci/scripts/install_minio.sh index 5cda46e59e6b5..3d1ecf4bda89f 100755 --- a/ci/scripts/install_minio.sh +++ b/ci/scripts/install_minio.sh @@ -20,28 +20,21 @@ set -e declare -A archs -archs=([amd64]=amd64 - [arm64v8]=arm64 - [arm32v7]=arm - [s390x]=s390x) +archs=([x86_64]=amd64 + [arm64]=arm64 + [aarch64]=arm64) declare -A platforms -platforms=([linux]=linux - [macos]=darwin) +platforms=([Linux]=linux + [Darwin]=darwin) -arch=${archs[$1]} -platform=${platforms[$2]} -version=$3 -prefix=$4 +arch=${archs[$(uname -m)]} +platform=${platforms[$(uname)]} +version=$1 +prefix=$2 -if [ "$#" -ne 4 ]; then - echo "Usage: $0 " - exit 1 -elif [[ -z ${arch} ]]; then - echo "Unexpected architecture: ${1}" - exit 1 -elif [[ -z ${platform} ]]; then - echo "Unexpected platform: ${2}" +if [ "$#" -ne 2 ]; then + echo "Usage: $0 " exit 1 elif [[ ${version} != "latest" ]]; then echo "Cannot fetch specific versions of minio, only latest is supported." diff --git a/ci/scripts/r_docker_configure.sh b/ci/scripts/r_docker_configure.sh index 20c987085ae64..4d837d9d7f1fb 100755 --- a/ci/scripts/r_docker_configure.sh +++ b/ci/scripts/r_docker_configure.sh @@ -69,11 +69,11 @@ if [ "$ARROW_S3" == "ON" ] || [ "$ARROW_R_DEV" == "TRUE" ]; then # The Dockerfile should have put this file here if [ -f "/arrow/ci/scripts/install_minio.sh" ] && [ "`which wget`" ]; then - /arrow/ci/scripts/install_minio.sh amd64 linux latest /usr/local + /arrow/ci/scripts/install_minio.sh latest /usr/local fi if [ -f "/arrow/ci/scripts/install_gcs_testbench.sh" ] && [ "`which pip`" ]; then - /arrow/ci/scripts/install_gcs_testbench.sh amd64 default + /arrow/ci/scripts/install_gcs_testbench.sh default fi fi diff --git a/docker-compose.yml b/docker-compose.yml index cb9ff994fa5f6..a38210cc5e022 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -97,6 +97,7 @@ x-hierarchy: # service entry, so any new image/service must be listed here. - conda: - conda-cpp: + - conda-integration - conda-cpp-hiveserver2 - conda-cpp-valgrind - conda-python: @@ -108,7 +109,7 @@ x-hierarchy: - conda-python-turbodbc - conda-python-kartothek - conda-python-spark - - conda-integration + - debian-cpp: - debian-c-glib: - debian-ruby @@ -203,7 +204,6 @@ services: - ${REPO}:${ARCH}-conda args: arch: ${ARCH} - prefix: /opt/conda volumes: - .:/arrow:delegated @@ -259,7 +259,6 @@ services: args: repo: ${REPO} arch: ${ARCH} - prefix: /opt/conda shm_size: *shm-size environment: <<: *ccache