Merge pull request #122 from dbt-msft/minimize-docker-image

Clean up CI config and Docker image

Author: dataders

.circleci/Dockerfile

@@ -0,0 +1,30 @@
+
+FROM cimg/python:3.7.10 AS base
+USER root
+
+# Setup dependencies for pyodbc
+RUN \
+    apt-get update && \
+    apt-get install -y unixodbc-dev unixodbc g++ apt-transport-https && \
+    gpg --keyserver hkp://keys.gnupg.net:80 --recv-keys 5072E1F5
+
+RUN \
+  export ACCEPT_EULA='Y' && \
+  # Install pyodbc db drivers for MSSQL
+  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 && \
+  apt-get install -y msodbcsql17 odbc-postgresql mssql-tools
+
+# add sqlcmd to the path
+ENV PATH="$PATH:/opt/mssql-tools/bin"
+
+# Update odbcinst.ini to make sure full path to driver is listed
+RUN \
+  sed 's/Driver=psql/Driver=\/usr\/lib\/x86_64-linux-gnu\/odbc\/psql/' /etc/odbcinst.ini > /tmp/temp.ini && \
+  mv -f /tmp/temp.ini /etc/odbcinst.ini
+
+RUN \
+  # Cleanup build dependencies
+  apt-get remove -y curl apt-transport-https debconf-utils rsync build-essential gnupg2 && \
+  apt-get autoremove -y && apt-get autoclean -y

.circleci/config.yml

@@ -1,34 +1,32 @@
 version: 2.1
 
 orbs:
-  python: circleci/python@1.1.0
+  python: circleci/python@1.3
   azure-cli: circleci/[email protected]
 
 jobs:
   unit:
-    docker:
-      - image: dataders/pyodbc:1.4
+    docker: &msodbc_py
+      - image: &docker_image dbtmsft/msodbc_py:0.5
     steps:
       - checkout
+      - python/install-packages:
+                pkg-manager: pip
+                pip-dependency-file: dev_requirements.txt
       - run: tox -- -v test/unit
   integration-sqlserver: &sqlserver
-    docker:
-      - image: dataders/pyodbc:1.4
+    docker: &msodbc_py_&_sqlserver
+      - image: *docker_image
       - image: mcr.microsoft.com/mssql/server:2019-latest
         environment:
           ACCEPT_EULA: 'yes'
           MSSQL_SA_PASSWORD: 5atyaNadella
           MSSQL_IP_ADDRESS: 0.0.0.0
     steps:
-      - run: &install-git
-          name: "TEMP: install Git"
-          command: |
-            apt-get install -y git
-      - run: &upgrade-dbt
-          name: "TEMP: upgrade dbt"  # hot fix: dbt is installed in the pyodbc docker image, it should be removed there
-          command: |
-            pip install --upgrade dbt
       - checkout
+      - python/install-packages:
+                pkg-manager: pip
+                pip-dependency-file: dev_requirements.txt
       - run:
           name: wait for SQL Server container to set up
           command: sleep 30
@@ -41,12 +39,10 @@ jobs:
   connection-sqlserver:
     <<: *sqlserver
     steps:
-      - run: *install-git
-      - run: *upgrade-dbt
       - checkout
       - run: &install-dbt-sqlserver
           name: "install dbt-sqlserver"
-          command: python setup.py install
+          command: pip install .
       - run:
           name: wait for SQL Server container to set up
           command: sleep 30
@@ -67,32 +63,20 @@ jobs:
             dbt compile --target sqlserver_local_encrypt
 
   integration-azuresql:
-    docker:
-      - image: dataders/pyodbc:1.4
+    docker: *msodbc_py
     steps:
-      - run: *install-git
-      - run: *upgrade-dbt
       - checkout
-      - run: *install-dbt-sqlserver
-      - run:
-          name: wake up serverless db
-          command: |
-            cd test/integration
-            dbt debug --target azuresql_sqlcred
+      - python/install-packages:
+                pkg-manager: pip
+                pip-dependency-file: dev_requirements.txt
       - run:
           name: Test adapter on Azure SQL against dbt-adapter-tests
           command: tox -- -v test/integration/azuresql.dbtspec
   connection-azuresql:
-    docker:
-      - image: dataders/pyodbc:1.4
+    docker: *msodbc_py
     steps:
-      - run: *install-git
-      - run: *upgrade-dbt
       - checkout
       - run: *install-dbt-sqlserver
-      - run:
-          name: install gnupg
-          command: apt-get install gnupg -y
       - azure-cli/install
       - run: *prep=connect
       - run:
@@ -124,13 +108,9 @@ workflows:
   main:
     jobs:
       - unit
-      - connection-azuresql:
-          context:
-            - DBT_SYNAPSE_PROFILE
-      - connection-sqlserver:
-          context:
-            - DBT_SYNAPSE_PROFILE
-      - integration-sqlserver
-      - integration-azuresql:
+      - connection-azuresql: &profile
           context:
             - DBT_SYNAPSE_PROFILE
+      - connection-sqlserver: *profile
+      - integration-sqlserver: *profile
+      - integration-azuresql: *profile

CHANGELOG.md

@@ -13,6 +13,7 @@
 
 #### under the hood
 - dbt-sqlserver's incremental materialization is now 100% aligneed logically to dbt's global_project behavior! this makes maintaining `dbt-sqlserver` easier by decreasing code footprint. [#102](https://github.com/dbt-msft/dbt-sqlserver/pull/102)
+- clean up CI config and corresponding Docker image [#122](https://github.com/dbt-msft/dbt-sqlserver/pull/122)
 
 ### v0.19.0