diff --git a/arrow-odbc-integration-testing/Cargo.toml b/arrow-odbc-integration-testing/Cargo.toml index 942fafdd577..add16ba5d2d 100644 --- a/arrow-odbc-integration-testing/Cargo.toml +++ b/arrow-odbc-integration-testing/Cargo.toml @@ -8,4 +8,4 @@ edition = "2021" arrow2 = { path = "../", default-features = false, features = ["io_odbc"] } lazy_static = "1.4.0" # Function name macro is used to ensure unique table names in test -stdext = "0.3.1" \ No newline at end of file +stdext = "0.3.1" diff --git a/arrow-odbc-integration-testing/docker-compose.yml b/arrow-odbc-integration-testing/docker-compose.yml index 311fef81cbc..9c344136652 100644 --- a/arrow-odbc-integration-testing/docker-compose.yml +++ b/arrow-odbc-integration-testing/docker-compose.yml @@ -8,14 +8,3 @@ services: environment: - MSSQL_SA_PASSWORD=My@Test@Password1 command: ["/opt/mssql/bin/sqlservr", "--accept-eula", "--reset-sa-password"] - - dev: - build: . - volumes: - - .:/workspace:cached - - # Overrides default command so things don't shut down after the process ends. - command: sleep infinity - - # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function. - network_mode: service:mssql diff --git a/arrow-odbc-integration-testing/dockerfile b/arrow-odbc-integration-testing/dockerfile deleted file mode 100644 index bc25009fde6..00000000000 --- a/arrow-odbc-integration-testing/dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.163.1/containers/debian/.devcontainer/base.Dockerfile - -# [Choice] Debian version: buster, stretch -ARG VARIANT="buster" -FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT} - -# Install Microsoft ODBC SQL Drivers (msodbcsql17 package) for Debian 10 -# https://docs.microsoft.com/de-de/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15 -RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - -RUN curl https://packages.microsoft.com/config/debian/10/prod.list > /etc/apt/sources.list.d/mssql-release.list -RUN echo msodbcsql17 msodbcsql/ACCEPT_EULA boolean true | debconf-set-selections - -# [Optional] Uncomment this section to install additional packages. -RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get -y install --no-install-recommends \ - build-essential \ - unixodbc-dev \ - msodbcsql17 - -# Setup cargo and install cargo packages required for tests -USER vscode - -# There is also a rust devcontainer, yet this way we get a toolchain -# which is updatable with rustup. -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y - -# We need 'parquet-read' to run the tests. At the moment I do not -# know a way to specify cargo installable executables as build -# dependencies. -RUN /home/vscode/.cargo/bin/cargo install parquet --features cli