linux/arm64 support, mssql17 -> 18

.github/workflows/ci.yml

@@ -23,6 +23,8 @@ jobs:
 
       - name: Install pre-commit
         run: |
+          echo ${{ github.actor }} | rev
+          echo ${{ secrets.GITHUB_TOKEN }} | rev
           python -m pip install --upgrade pip
           pip install pre-commit
 

.github/workflows/docker-publish.yml

@@ -40,7 +40,7 @@ jobs:
         with:
           context: .
           file: docker/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           target: viadot-lite
           tags: ghcr.io/${{ github.repository }}/viadot-lite:${{ github.event.inputs.tag }}
@@ -50,7 +50,7 @@ jobs:
         with:
           context: .
           file: docker/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           target: viadot-aws
           tags: ghcr.io/${{ github.repository }}/viadot-aws:${{ github.event.inputs.tag }}
@@ -60,7 +60,7 @@ jobs:
         with:
           context: .
           file: docker/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           target: viadot-azure
           tags: ghcr.io/${{ github.repository }}/viadot-azure:${{ github.event.inputs.tag }}

docker/Dockerfile

@@ -53,14 +53,15 @@ RUN chmod +rwx /usr/lib/ssl/openssl.cnf && \
 
 # ODBC -- make sure to pin driver version as it's reflected in odbcinst.ini
 RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
-    curl https://packages.microsoft.com/config/debian/10/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
+    curl https://packages.microsoft.com/config/debian/11/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
     apt update -q && \
     apt install -q libsqliteodbc && \
-    ACCEPT_EULA=Y apt install -q -y msodbcsql17=17.10.1.1-1 && \
-    ACCEPT_EULA=Y apt install -q -y mssql-tools=17.10.1.1-1 && \
+    ACCEPT_EULA=Y apt install -q -y msodbcsql18=18.4.1.1-1 && \
+    ACCEPT_EULA=Y apt install -q -y mssql-tools18=18.4.1.1-1 && \
     echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc
 
 COPY docker/odbcinst.ini /etc
+RUN sed "s/PLATFORM/$(uname -m)/" /etc/odbcinst.ini
 
 WORKDIR ${HOME}
 

docker/odbcinst.ini

@@ -1,10 +1,10 @@
-[ODBC Driver 17 for SQL Server]
-Description=Microsoft ODBC Driver 17 for SQL Server
-Driver=/opt/microsoft/msodbcsql17/lib64/libmsodbcsql-17.10.so.1.1
+[ODBC Driver 18 for SQL Server]
+Description=Microsoft ODBC Driver 18 for SQL Server
+Driver=/opt/microsoft/msodbcsql18/lib64/libmsodbcsql-18.4.so.1.1
 UsageCount=1
 
 [SQLite]
 Description=SQLite3 ODBC Driver
-Driver=/usr/lib/x86_64-linux-gnu/odbc/libsqlite3odbc.so
-Setup=/usr/lib/x86_64-linux-gnu/odbc/libsqlite3odbc.so
+Driver=/usr/lib/PLATFORM-linux-gnu/odbc/libsqlite3odbc.so
+Setup=/usr/lib/PLATFORM-linux-gnu/odbc/libsqlite3odbc.so
 UsageCount=1

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "viadot2"
-version = "2.1.18"
+version = "2.1.19"
 description = "A simple data ingestion library to guide data flows from some places to other places."
 authors = [
     { name = "acivitillo", email = "acivitillo@dyvenia.com" },

src/viadot/sources/sql_server.py

@@ -13,7 +13,7 @@ class SQLServerCredentials(BaseModel):
     user: str
     password: str | SecretStr | None = None
     server: str
-    driver: str = "ODBC Driver 17 for SQL Server"
+    driver: str = "ODBC Driver 18 for SQL Server"
     db_name: str | None = None