diff --git a/.travis.yml b/.travis.yml index d53d79d..65fe27e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: required language: elixir elixir: - - 1.5 + - 1.6.5 services: - docker @@ -11,7 +11,8 @@ install: - docker-compose build mssqlex script: - - docker-compose run mssqlex + - docker-compose run mssqlex mix compile --warnings-as-errors + - docker-compose run mssqlex mix coveralls.travis after_script: - mix local.hex --force diff --git a/Dockerfile b/Dockerfile index 3b03f81..caa880f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM elixir:1.5 +FROM elixir:1.6.5-slim # --- Set Locale to en_US.UTF-8 --- @@ -14,13 +14,12 @@ ENV LC_ALL en_US.UTF-8 # --- MSSQL ODBC INSTALL --- -RUN apt-get update && apt-get install -y --no-install-recommends apt-transport-https - -RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ -&& curl https://packages.microsoft.com/config/debian/8/prod.list | tee -a /etc/apt/sources.list.d/mssql-release.list \ -&& apt-get update \ -&& ACCEPT_EULA=Y apt-get install msodbcsql -y \ -&& apt-get install unixodbc-dev -y +RUN apt-get update && \ + apt-get -y install curl apt-transport-https gnupg2 && \ + curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \ + curl https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources.list.d/mssql-release.list && \ + apt-get update && \ + ACCEPT_EULA=Y apt-get install -y msodbcsql17 # --- APP INSTALL --- @@ -29,7 +28,7 @@ RUN mix local.hex --force && \ COPY . /usr/src/app WORKDIR /usr/src/app -RUN mix do deps.get +RUN mix do deps.get, deps.compile # --- Be able to run wait for it script --- diff --git a/docker-compose.yml b/docker-compose.yml index 827155e..903633c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,8 +16,13 @@ services: - MSSQL_HST=sql_server - MSSQL_IN=MSSQLSERVER - MSSQL_PRT=9204 - - MSSQL_DVR={ODBC Driver 13 for SQL Server} + - MSSQL_DVR={ODBC Driver 17 for SQL Server} - TRAVIS_JOB_ID=$TRAVIS_JOB_ID depends_on: - sql_server - command: ["./wait-for-it.sh", "sql_server:9204", "-s", "--", "mix", "coveralls.travis"] + volumes: + - .:/usr/src/app/ + - /usr/src/app/deps + - /usr/src/app/_build + entrypoint: ./wait-for-it.sh sql_server:9204 -- + command: mix test