From df61cd725e89ab502f648d4fe8ede1c130c31407 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Mon, 11 Oct 2021 09:30:29 +0000
Subject: [PATCH] Use Fedora 35 as base image for the API to benefit GHC 8.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We are hitting:

src/Data/Primitive/Contiguous/Class.hs:11:14: error:
    Unsupported extension: UnliftedNewtypes
    Perhaps you meant ‘UnliftedFFITypes’

Also update github action to use stock docker engine, see:
https://github.com/change-metrics/monocle/pull/652
---
 .github/workflows/publish-master.yaml |  8 ++++++++
 .github/workflows/publish-tag.yaml    |  8 ++++++++
 .github/workflows/validate-pr.yaml    | 12 ++++++++----
 Dockerfile-api                        |  2 +-
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-master.yaml b/.github/workflows/publish-master.yaml
index 4b7cd9cb7..55aa71772 100644
--- a/.github/workflows/publish-master.yaml
+++ b/.github/workflows/publish-master.yaml
@@ -8,6 +8,14 @@ jobs:
     if: github.repository_owner == 'change-metrics'
     runs-on: ubuntu-latest
     steps:
+      # See https://github.com/actions/virtual-environments/issues/3812 for more information
+      - name: Download Docker with patched seccomp
+        run: |
+          sudo systemctl stop docker containerd
+          sudo apt-get remove --autoremove -y moby-engine moby-cli moby-buildx moby-containerd moby-runc
+          sudo add-apt-repository -y ppa:pascallj/docker.io-clone3
+          sudo apt-get install -y docker.io
+
       - name: Checkout code
         uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/publish-tag.yaml b/.github/workflows/publish-tag.yaml
index 9985b1e82..71207df31 100644
--- a/.github/workflows/publish-tag.yaml
+++ b/.github/workflows/publish-tag.yaml
@@ -8,6 +8,14 @@ jobs:
     if: github.repository_owner == 'change-metrics'
     runs-on: ubuntu-latest
     steps:
+      # See https://github.com/actions/virtual-environments/issues/3812 for more information
+      - name: Download Docker with patched seccomp
+        run: |
+          sudo systemctl stop docker containerd
+          sudo apt-get remove --autoremove -y moby-engine moby-cli moby-buildx moby-containerd moby-runc
+          sudo add-apt-repository -y ppa:pascallj/docker.io-clone3
+          sudo apt-get install -y docker.io
+
       - name: Checkout code
         uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/validate-pr.yaml b/.github/workflows/validate-pr.yaml
index 4356cb5ef..82c3d9492 100644
--- a/.github/workflows/validate-pr.yaml
+++ b/.github/workflows/validate-pr.yaml
@@ -39,13 +39,17 @@ jobs:
       - name: Test with tox
         run: tox -e py3
 
-      # - name: Validate usefulness of tests
-      #   uses: quality-of-tests/has-useful-tests-action@master
-      #   with:
-      #     run-tests: tox -epy3
   docker:
     runs-on: ubuntu-latest
     steps:
+      # See https://github.com/actions/virtual-environments/issues/3812 for more information
+      - name: Download Docker with patched seccomp
+        run: |
+          sudo systemctl stop docker containerd
+          sudo apt-get remove --autoremove -y moby-engine moby-cli moby-buildx moby-containerd moby-runc
+          sudo add-apt-repository -y ppa:pascallj/docker.io-clone3
+          sudo apt-get install -y docker.io
+
       - name: Checkout code
         uses: actions/checkout@v2
         with:
diff --git a/Dockerfile-api b/Dockerfile-api
index e5879408f..374fb8b89 100644
--- a/Dockerfile-api
+++ b/Dockerfile-api
@@ -22,6 +22,6 @@ COPY haskell/ /build
 RUN cabal v2-install -v1 exe:monocle-api exe:macroscope
 
 ################################################################################
-FROM registry.fedoraproject.org/fedora:33
+FROM registry.fedoraproject.org/fedora:35
 
 COPY --from=0 /root/.cabal/bin/monocle-api /root/.cabal/bin/macroscope /bin/