Use new key import method on Ubuntu

Author: fabiang

.github/workflows/docker.yml

@@ -55,6 +55,39 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: SQLServer Checksum
+        id: sqlserver-checksum
+        shell: bash
+        run: | 
+          echo "checksum=$(curl --silent -L --header 'Accept: application/vnd.docker.distribution.manifest.v2+json' 'https://mcr.microsoft.com/v2/mssql/server/manifests/2022-latest' | jq -r '.config.digest')" >> $GITHUB_OUTPUT
+
+      - name: Cache Docker Image
+        id: docker-image-cache
+        uses: actions/cache@v3
+        with:
+          path: '*.tar'
+          key: docker-image-cache-${{ runner.os }}-${{ steps.sqlserver-checksum.outputs.checksum }}
+
+      - name: Load SQLServer image
+        if: steps.docker-image-cache.outputs.cache-hit == 'true'
+        run: docker image load -i sqlserver.tar
+
+      - name: Run SQL Server
+        run: |
+          docker run \
+            --pull always \
+            -e 'ACCEPT_EULA=Y' \
+            -e 'MSSQL_SA_PASSWORD=yourStrong(!)Password' \
+            -p 1433:1433 \
+            -d \
+            --name SQLServer \
+            --rm \
+            mcr.microsoft.com/mssql/server:2022-latest
+
+      - name: Save SQLServer image
+        if: steps.docker-image-cache.outputs.cache-hit != 'true'
+        run: docker image save -o sqlserver.tar mcr.microsoft.com/mssql/server:2022-latest
+
       - uses: satackey/action-docker-layer-caching@v0.0.11
         continue-on-error: true
 
@@ -69,11 +102,23 @@ jobs:
             '--build-arg=MSSQLTOOLS_PATH=${{ matrix.version.package_path }}' \
             .
 
+      - name: Wait for SQLServer to become available
+        uses: iFaxity/wait-on-action@v1.1.0
+        with:
+          resource: tcp:localhost:1433
+          timeout: 1800000
+          interval: 5000
+          log: true
+
       - name: Test image
         run: |
-          docker run -t --rm --entrypoint='' \
+          docker run -t --rm --entrypoint='' --network=host \
             '${{ env.IMAGE_NAME_FULL }}' \
-            sqlcmd -?
+            sqlcmd -b -C -S 127.0.0.1,1433 -U sa -P 'yourStrong(!)Password' -Q 'SELECT @@VERSION'
+
+      - name: Stop SQLServer
+        if: always()
+        run: docker stop SQLServer
 
       - name: Tag Minor
         if: "${{ matrix.version.sqlcmd_minor != '' }}"

ubuntu/Dockerfile

@@ -1,22 +1,32 @@
-ARG UBUNTU_VERSION=18.04
+ARG UBUNTU_VERSION=22.04
 FROM ubuntu:$UBUNTU_VERSION
 
-ARG MSSQLTOOLS_VERSION=17.4.1.1-1
+ARG MSSQLTOOLS_VERSION=18.2.1.1
 # Microsoft decided to have a suffix for newer versions of mssql-tools, e.g. mssql-tools18
-ARG MSSQLTOOLS_SUFFIX=
+ARG MSSQLTOOLS_SUFFIX=18
 # and also the path changed on newer versions. It's a mess.
-ARG MSSQLTOOLS_PATH=/opt/mssql-tools
+ARG MSSQLTOOLS_PATH=/opt/mssql-tools18
+
 ENV PATH=$MSSQLTOOLS_PATH/bin:$PATH
 
-RUN apt-get update \
-    && apt-get install -y curl apt-transport-https locales gnupg2 dos2unix \
+RUN apt-get -qqq update \
+    && apt-get install -y curl apt-transport-https locales gnupg2 \
+        # Helper command to convert \r\n to \n,
+        # since sqlcmd prints Windows line endings
+        dos2unix \
     && locale-gen "en_US.UTF-8" \
+    \
     && export `grep "VERSION_ID" /etc/os-release | sed -e 's/^VERSION_ID=\"/VERSION_ID=/' -e 's/\"$//'` \
-    && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
-    && curl https://packages.microsoft.com/config/ubuntu/$VERSION_ID/prod.list | tee /etc/apt/sources.list.d/msprod.list \
-    && apt-get update \
+    && mkdir -p /etc/apt/keyrings/ \
+    && curl --fail https://packages.microsoft.com/config/ubuntu/$VERSION_ID/prod.list | \
+        sed -E 's#deb\s+\[#deb [signed-by=/etc/apt/keyrings/microsoft.gpg #; t; q1' | \
+        tee /etc/apt/sources.list.d/microsoft.list \
+    && curl --fail https://packages.microsoft.com/keys/microsoft.asc | \
+        gpg --verbose --yes --no-tty --batch --dearmor -o /etc/apt/keyrings/microsoft.gpg \
+    \
+    && apt-get -qqq update \
     && ACCEPT_EULA=Y apt-get install -y mssql-tools$MSSQLTOOLS_SUFFIX=$MSSQLTOOLS_VERSION unixodbc-dev \
-    && apt-get remove -y curl apt-transport-https \
+    && apt-get remove -y curl apt-transport-https gnupg2 \
     && rm -f /etc/apt/sources.list.d/msprod.list \
     && rm -rf /var/lib/apt/lists/*