Move back to ubuntu 20.04

scrtlabs · Oct 30, 2024 · 71b6b9e · 71b6b9e
1 parent b7f0a3a
commit 71b6b9e
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 28 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   Enclave-Unit-Tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -15,7 +15,7 @@ jobs:
           mkdir -p "$HOME/.sgxsdk"
           cd "$HOME/.sgxsdk"
           SDK_BIN=sgx_linux_x64_sdk_2.20.100.4.bin
-          wget https://download.01.org/intel-sgx/sgx-linux/2.20/distro/ubuntu22.04-server/"$SDK_BIN"
+          wget https://download.01.org/intel-sgx/sgx-linux/2.20/distro/ubuntu20.04-server/"$SDK_BIN"
           chmod +x "$SDK_BIN"
           echo yes | ./"$SDK_BIN"
       - name: Cache cargo registry
@@ -51,7 +51,7 @@ jobs:
           make clean-enclave
 
   Build-Contracts:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
       - name: Install Requirements
@@ -97,7 +97,7 @@ jobs:
           path: cosmwasm/contracts/v010/compute-tests/test-compute-contract/static-too-high-initial-memory.wasm
 
   Go-Tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [Build-Contracts, Build-LocalSecret]
     steps:
       - uses: actions/checkout@v4
@@ -164,9 +164,9 @@ jobs:
       - name: Install Quote library SDK
         run: |
           curl -fsSL https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | sudo apt-key add -
-          sudo add-apt-repository "deb https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main"
-          DCAP_VERSION=1.17.100.4-jammy1
-          PSW_VERSION=2.20.100.4-jammy1
+          sudo add-apt-repository "deb https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main"
+          DCAP_VERSION=1.17.100.4-focal1
+          PSW_VERSION=2.20.100.4-focal1
           sudo apt-get update
           sudo apt-get install -y \
               libsgx-aesm-launch-plugin=$PSW_VERSION \
@@ -205,7 +205,7 @@ jobs:
           LOG_LEVEL=ERROR SKIP_LIGHT_CLIENT_VALIDATION=TRUE go test -p 1 -timeout 90m -v -tags "test" ./x/compute/internal/...
 
   Clippy:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -276,7 +276,7 @@ jobs:
           path: secretcli
 
   Build-LocalSecret:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -311,7 +311,7 @@ jobs:
           path: /tmp/localsecret.tar
 
   Build-Hermes:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -334,7 +334,7 @@ jobs:
           path: /tmp/hermes.tar
 
   Integration-Tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [Build-LocalSecret, Build-Hermes]
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -23,7 +23,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     permissions:
       actions: read
       contents: read

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         db_backend: [goleveldb]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     env: # Or as an environment variable
       SPID: ${{ secrets.SPID_TESTNET }}
       API_KEY: ${{ secrets.API_KEY_TESTNET }}
@@ -66,7 +66,7 @@ jobs:
           path: secretnetwork_${{ steps.get_version.outputs.VERSION }}_testnet_${{ matrix.db_backend }}_amd64.deb
 
   build-deb-mainnet:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -146,7 +146,7 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        os: [ubuntu-22.04, windows-latest, macos-13]
+        os: [ubuntu-20.04, windows-latest, macos-13]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -186,7 +186,7 @@ jobs:
           path: secretcli-MacOS-arm64
 
   check-hw-tool:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     env: # Or as an environment variable
       SPID: ${{ secrets.SPID_TESTNET }}
       API_KEY: ${{ secrets.API_KEY_TESTNET }}
@@ -224,7 +224,7 @@ jobs:
           path: check_hw_${{ steps.get_version.outputs.VERSION }}.tar.gz
 
   publish-localsecret:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     env:
       REGISTRY: ghcr.io
       IMAGE_NAME: scrtlabs/localsecret
@@ -262,7 +262,7 @@ jobs:
           target: build-localsecret
 
   Lib-Checks:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/check-objdump
@@ -285,7 +285,7 @@ jobs:
         # check-hw-tool,
         # check-hw-tool-mainnet
       ]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
       - name: Get the version

diff --git a/deployment/dockerfiles/Dockerfile b/deployment/dockerfiles/Dockerfile
@@ -8,7 +8,7 @@
 #   `--target compile-secretd` - image with compiled enclave and secretd
 
 ARG SCRT_BASE_IMAGE_ENCLAVE=ghcr.io/scrtlabs/sgx-rust:2204-1.1.6
-ARG SCRT_RELEASE_BASE_IMAGE=ghcr.io/scrtlabs/release-base:22.04-2.20-dcap
+ARG SCRT_RELEASE_BASE_IMAGE=ghcr.io/scrtlabs/release-base:20.04-2.20-dcap
 
 # ***************** PREPARE COMPILE ENCLAVE ************** #
 
@@ -153,7 +153,7 @@ RUN . /opt/sgxsdk/environment && env && VERSION=${VERSION} FEATURES=${FEATURES}
 FROM $SCRT_RELEASE_BASE_IMAGE as release-image
 
 # wasmi-sgx-test script requirements
-RUN add-apt-repository -r "deb https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main" && \
+RUN add-apt-repository -r "deb https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main" && \
     apt-get update && \
     apt-get install -y --no-install-recommends \
     #### Base utilities ####

diff --git a/deployment/dockerfiles/base-images/app.Dockerfile b/deployment/dockerfiles/base-images/app.Dockerfile
@@ -1,13 +1,13 @@
-FROM ubuntu:jammy as runtime_base
+FROM ubuntu:focal as runtime_base
 
 LABEL maintainer=enigmampc
 
 # SGX version parameters
 ARG SDK_VERSION=2.20
 ARG SGX_VERSION=2.20.100.4
-ARG PSW_VERSION=2.20.100.4-jammy1
-ARG OS_REVESION=jammy1
-ARG DCAP_VERSION=1.17.100.4-jammy1
+ARG PSW_VERSION=2.20.100.4-focal1
+ARG OS_REVESION=focal1
+ARG DCAP_VERSION=1.17.100.4-focal1
 #RUN apt-get update && \
 #    apt-get install -y --no-install-recommends \
 #    #### Base utilities ####
@@ -34,7 +34,7 @@ RUN mkdir /etc/init && \
 RUN apt-get update && \
     apt-get install -y gnupg2 apt-transport-https ca-certificates curl software-properties-common make g++ libcurl4 libssl3 && \
     curl -fsSL https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | apt-key add - && \
-    add-apt-repository "deb https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main" && \
+    add-apt-repository "deb https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main" && \
     apt-get update && \
     apt-get install -y \
         libsgx-aesm-launch-plugin=$PSW_VERSION \
@@ -82,7 +82,7 @@ RUN apt-get update && \
 
 #RUN apt-get install libsgx-epid libsgx-quote-ex libsgx-dcap-ql
 #
-ADD https://download.01.org/intel-sgx/sgx-linux/${SDK_VERSION}/distro/ubuntu22.04-server/sgx_linux_x64_sdk_${SGX_VERSION}.bin ./sgx/
+ADD https://download.01.org/intel-sgx/sgx-linux/${SDK_VERSION}/distro/ubuntu20.04-server/sgx_linux_x64_sdk_${SGX_VERSION}.bin ./sgx/
 # ADD https://download.01.org/intel-sgx/sgx-linux/${SDK_VERSION}/distro/ubuntu20.04-server/sgx_linux_x64_sdk_${SGX_VERSION}.bin ./sgx/
 ## ADD https://download.01.org/intel-sgx/sgx-linux/2.9.1/distro/ubuntu18.04-server/sgx_linux_x64_driver_2.6.0_95eaa6f.bin ./sgx/
 ##
@@ -93,4 +93,4 @@ RUN echo -e 'no\n/opt' | ./sgx/sgx_linux_x64_sdk_${SGX_VERSION}.bin && \
 ##
 ENV LD_LIBRARY_PATH=/opt/sgxsdk/libsgx-enclave-common/
 #
-##RUN SGX_DEBUG=0 SGX_MODE=HW SGX_PRERELEASE=1 make
+##RUN SGX_DEBUG=0 SGX_MODE=HW SGX_PRERELEASE=1 make