diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index b7c9e5f04..a08864804 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,7 +1,7 @@ -# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.205.2/containers/ubuntu/.devcontainer/base.Dockerfile +# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/main/containers/ubuntu/.devcontainer/base.Dockerfile -# [Choice] Ubuntu version (use hirsuite or bionic on local arm64/Apple Silicon): hirsute, focal, bionic -ARG VARIANT="focal" +# [Choice] Ubuntu version (use ubuntu-22.04 or ubuntu-18.04 on local arm64/Apple Silicon): ubuntu-22.04, ubuntu-20.04, ubuntu-18.04 +ARG VARIANT="ubuntu-22.04" FROM mcr.microsoft.com/vscode/devcontainers/base:${VARIANT} RUN apt-get update -y && apt-get install -y \ @@ -16,23 +16,19 @@ RUN apt-get update -y && apt-get install -y \ jq # ======================================================================================================== -# Update repository signing keys +# Get repository signing keys # -------------------------------------------------------------------------------------------------------- # Hyperledger -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ - # Sovrin - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 +RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ + gpg --export 9692C00E657DDE61 > /etc/apt/keyrings/hyperledger.gpg # ======================================================================================================== # Plenum # - https://github.com/hyperledger/indy-plenum/issues/1546 # - Needed to pick up rocksdb=5.8.8 -RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy focal dev" >> /etc/apt/sources.list && \ - echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list && \ - echo "deb https://repo.sovrin.org/deb bionic master" >> /etc/apt/sources.list && \ - echo "deb https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list +RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger.jfrog.io/artifactory/indy jammy dev rc" > /etc/apt/sources.list.d/hyperledger.list -RUN apt-get update -y && apt-get install -y \ +RUN apt update -y && apt install -y \ # Python python3-pip \ python3-nacl \ @@ -53,22 +49,19 @@ RUN apt-get update -y && apt-get install -y \ gcc \ make \ # Indy Node and Plenum - libssl1.0.0 \ - ursa=0.3.2-1 \ - # Indy SDK - libindy=1.15.0~1625-bionic \ - # Need to move libursa.so to parent dir - && mv /usr/lib/ursa/* /usr/lib && rm -rf /usr/lib/ursa + # Indy SDK is not used anymore + #libindy \ + libssl3 RUN pip3 install -U \ # Required by setup.py - setuptools==50.3.2 \ - 'pyzmq==22.3.0' \ + setuptools==75.8.0 \ + pyzmq==26.2.1 \ Cython==0.29.36 - # install fpm -RUN gem install --no-document rake dotenv:2.8.1 fpm:1.14.2 +RUN gem install --no-document rake dotenv:2.8.1 fpm:1.15.0 && \ + pip3 install Cython==0.29.36 -RUN apt-get -y autoremove \ +RUN apt -y autoremove \ && rm -rf /var/lib/apt/lists/* diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 26af0d16e..6a3f37335 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,9 +4,9 @@ "name": "Ubuntu", "build": { "dockerfile": "Dockerfile", - // Update 'VARIANT' to pick an Ubuntu version: hirsute, focal, bionic + // Update 'VARIANT' to pick an Ubuntu version: jammy, hirsute, focal, bionic // Use hirsute or bionic on local arm64/Apple Silicon. - "args": { "VARIANT": "focal" } + "args": { "VARIANT": "jammy" } }, "customizations": { diff --git a/.github/workflows/build/Dockerfile.ubuntu-2204 b/.github/workflows/build/Dockerfile.ubuntu-2204 index dde10261e..35ce801d0 100644 --- a/.github/workflows/build/Dockerfile.ubuntu-2204 +++ b/.github/workflows/build/Dockerfile.ubuntu-2204 @@ -3,7 +3,7 @@ FROM ubuntu:22.04 ARG uid=1000 ARG user=indy -RUN apt-get update -y && apt-get install -y \ +RUN apt update -y && apt install -y \ # common stuff git \ wget \ @@ -15,14 +15,11 @@ RUN apt-get update -y && apt-get install -y \ jq # ======================================================================================================== -# Update repository signing keys +# Get repository signing keys # -------------------------------------------------------------------------------------------------------- # Hyperledger -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ - # Sovrin - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \ - # Bionic-Security - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 +RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ + gpg --export 9692C00E657DDE61 > /etc/apt/keyrings/hyperledger.gpg # ======================================================================================================== # ToDo: @@ -31,16 +28,9 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && # Plenum # - https://github.com/hyperledger/indy-plenum/issues/1546 # - Needed to pick up rocksdb=5.8.8 -RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy jammy dev rc" >> /etc/apt/sources.list && \ - echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list && \ - echo "deb https://repo.sovrin.org/deb bionic master" >> /etc/apt/sources.list && \ - echo "deb https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list +RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger.jfrog.io/artifactory/indy jammy dev rc" > /etc/apt/sources.list.d/hyperledger.list -RUN apt-get update -y && apt-get install -y \ - rubygems \ - python3-pip && \ - apt-get -y autoremove && \ - rm -rf /var/lib/apt/lists/* +RUN apt update -y && apt install -y rubygems python3-pip && apt-get -y autoremove && rm -rf /var/lib/apt/lists/* # install fpm RUN gem install --no-document rake dotenv:2.8.1 fpm:1.15.0 && \ diff --git a/.github/workflows/releasepr.yaml b/.github/workflows/releasepr.yaml index b88139e12..e38b6f7c0 100644 --- a/.github/workflows/releasepr.yaml +++ b/.github/workflows/releasepr.yaml @@ -5,6 +5,7 @@ on: paths: - '!**' - "indy_node/__version__.json" + workflow_dispatch: jobs: release-infos: diff --git a/build-scripts/ubuntu-2204/Dockerfile b/build-scripts/ubuntu-2204/Dockerfile index 2c6ef0fe5..cb0acfe0a 100644 --- a/build-scripts/ubuntu-2204/Dockerfile +++ b/build-scripts/ubuntu-2204/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:22.04 ARG uid=1000 ARG user=indy -RUN apt-get update -y && apt-get install -y \ +RUN apt update -y && apt install -y \ # common stuff git \ wget \ @@ -13,28 +13,19 @@ RUN apt-get update -y && apt-get install -y \ apt-utils # ======================================================================================================== -# Update repository signing keys +# Get repository signing keys # -------------------------------------------------------------------------------------------------------- # Hyperledger -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ - # Sovrin - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \ - # Bionic-Security - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 +RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ + gpg --export 9692C00E657DDE61 > /etc/apt/keyrings/hyperledger.gpg # ======================================================================================================== # Plenum # - https://github.com/hyperledger/indy-plenum/issues/1546 # - Needed to pick up rocksdb=5.8.8 -RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy jammy dev" >> /etc/apt/sources.list && \ - echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list && \ - echo "deb https://repo.sovrin.org/deb bionic master" >> /etc/apt/sources.list && \ - echo "deb https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list +RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger.jfrog.io/artifactory/indy jammy dev rc" > /etc/apt/sources.list.d/hyperledger.list -# Sovrin -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 - -RUN apt-get update -y && apt-get install -y \ +RUN apt update -y && apt install -y \ # Python python3-pip \ python3-nacl \ @@ -55,21 +46,25 @@ RUN apt-get update -y && apt-get install -y \ gcc \ make \ # Indy Node and Plenum - libssl1.0.0 \ - ursa=0.3.2-1 \ + libssl3 + # Indy Node and Plenum + # Indy SDK is not used anymore + #libindy \ + # rsa=0.3.2-1 \ # Indy SDK - libindy=1.15.0~1625-bionic \ + # libindy=1.15.0~1625-bionic \ # Need to move libursa.so to parent dir - && mv /usr/lib/ursa/* /usr/lib && rm -rf /usr/lib/ursa + # && mv /usr/lib/ursa/* /usr/lib && rm -rf /usr/lib/ursa RUN pip3 install -U \ # Required by setup.py - setuptools==50.3.2 \ - 'pyzmq==22.3.0' + setuptools==75.8.0 \ + pyzmq==26.2.1 # install fpm -RUN gem install --no-document rake dotenv:2.8.1 fpm:1.14.2 +RUN gem install --no-document rake dotenv:2.8.1 fpm:1.15.0 && \ + pip3 install Cython==0.29.36 -RUN apt-get -y autoremove \ +RUN apt -y autoremove \ && rm -rf /var/lib/apt/lists/*