diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8f4c9cbd6..58f68b5d2 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.209.6/containers/ubuntu/.devcontainer/base.Dockerfile # [Choice] Ubuntu version (use hirsuite or bionic on local arm64/Apple Silicon): hirsute, focal, bionic -ARG VARIANT="focal" +ARG VARIANT="jammy" FROM mcr.microsoft.com/vscode/devcontainers/base:${VARIANT} # [Optional] Uncomment this section to install additional OS packages. @@ -19,17 +19,17 @@ RUN apt-get update -y && apt-get install -y \ curl \ jq - # ======================================================================================================== # Update 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 + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \ + # bionic-security + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 # ======================================================================================================== - # Plenum # - https://github.com/hyperledger/indy-plenum/issues/1546 # - Needed to pick up rocksdb=5.8.8 @@ -38,6 +38,12 @@ RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy focal dev" >> /etc 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 +# Kim's temp repo +# TODO: +# - Remove dependency on Kim's temp repo. +# - Change this to official repo +RUN echo "deb [trusted=yes] http://209.141.41.82:8000/ packagedir/" >> /etc/apt/sources.list + RUN apt-get update -y && apt-get install -y \ # Python python3-pip \ @@ -63,6 +69,11 @@ RUN apt-get update -y && apt-get install -y \ ursa=0.3.2-1 \ # Indy SDK libindy=1.15.0~1625-bionic \ + # Kim's updated packages + # - TODO: Remove dependency on Kim's temp repo. + python3-sortedcontainers \ + python3-rlp \ + python3-ioflo \ # Need to move libursa.so to parent dir && mv /usr/lib/ursa/* /usr/lib && rm -rf /usr/lib/ursa @@ -78,4 +89,4 @@ RUN pip3 install -U \ # install fpm -RUN gem install --no-document rake dotenv:2.8.1 fpm:1.14.2 \ No newline at end of file +RUN gem install --no-document rake dotenv:2.8.1 fpm:1.15.0 diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 52896fe80..596285d4d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,7 +6,7 @@ "dockerfile": "Dockerfile", // Update 'VARIANT' to pick an Ubuntu version: hirsute, focal, bionic // Use hirsute or bionic on local arm64/Apple Silicon. - "args": { "VARIANT": "focal" } + "args": { "VARIANT": "jammy" } }, // Set *default* container specific settings.json values on container create. @@ -29,4 +29,4 @@ // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. "remoteUser": "vscode" -} \ No newline at end of file +}