From 29feea1beb562dadb87c066a55e98733390b1bf3 Mon Sep 17 00:00:00 2001 From: DasSkelett Date: Thu, 30 Sep 2021 21:53:21 +0200 Subject: [PATCH 1/2] Remove expired Let's Encrypt root certificate from Mono containers --- Dockerfile.metadata | 2 ++ Dockerfile.netkan | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Dockerfile.metadata b/Dockerfile.metadata index dcca6df96a..a04026a577 100644 --- a/Dockerfile.metadata +++ b/Dockerfile.metadata @@ -1,5 +1,7 @@ FROM mono:latest +RUN /bin/sed -i 's/^mozilla\/DST_Root_CA_X3.crt$/!mozilla\/DST_Root_CA_X3.crt/' /etc/ca-certificates.conf && \ + /usr/sbin/update-ca-certificates RUN apt-get update && \ apt-get install -y --no-install-recommends python3 python3-pip python3-setuptools git build-essential python3-dev && \ apt-get clean diff --git a/Dockerfile.netkan b/Dockerfile.netkan index 962b757907..46ccfee6bd 100644 --- a/Dockerfile.netkan +++ b/Dockerfile.netkan @@ -1,4 +1,6 @@ FROM mono:latest +RUN /bin/sed -i 's/^mozilla\/DST_Root_CA_X3.crt$/!mozilla\/DST_Root_CA_X3.crt/' /etc/ca-certificates.conf && \ + /usr/sbin/update-ca-certificates RUN useradd -ms /bin/bash netkan USER netkan WORKDIR /home/netkan From 197399973ee69be2e3e139681f3a4c1317a3d430 Mon Sep 17 00:00:00 2001 From: DasSkelett Date: Fri, 1 Oct 2021 00:57:35 +0200 Subject: [PATCH 2/2] Add inflator container smoke test to build.yml --- .github/workflows/build.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5560158262..1bc597c9c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,6 +52,17 @@ jobs: run: ./build --configuration=${{ matrix.configuration}} - name: Run tests run: xvfb-run ./build test+only --configuration=${{ matrix.configuration }} --where="Category!=FlakyNetwork" + - name: Run inflator container smoke test + run: | + cd _build + curl -fsSL https://get.docker.com -o get-docker.sh + sh get-docker.sh + docker build --tag inflator --file ../Dockerfile.netkan . + docker run --rm --name inflator --entrypoint /bin/bash inflator -c " + curl -O https://raw.githubusercontent.com/KSP-CKAN/NetKAN/master/NetKAN/ZeroMiniAVC.netkan && \ + mono netkan.exe ZeroMiniAVC.netkan + " + if: matrix.configuration == 'release' && ( matrix.mono == '6.8' || matrix.mono == 'latest' ) - name: Upload ckan.exe artifact uses: actions/upload-artifact@v2