File tree Expand file tree Collapse file tree 5 files changed +7
-25
lines changed
dev-setup/ubuntu/ubuntu-2004 Expand file tree Collapse file tree 5 files changed +7
-25
lines changed Original file line number Diff line number Diff line change @@ -30,9 +30,6 @@ RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \
3030# bionic key
3131RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 && \
3232 gpg --export 3B4FE6ACC0B21F32 > /etc/apt/keyrings/ubuntu-bionic.gpg
33- # sovrin key
34- RUN gpg --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \
35- gpg --export CE7709D068DB5E88 > /etc/apt/keyrings/sovrin.gpg
3633# ========================================================================================================
3734
3835# ToDo:
@@ -45,10 +42,7 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger.
4542
4643# todo: Will be removed when libindy will have been replace by indy-vdr, askar, and indy-credx
4744RUN echo "deb [signed-by=/etc/apt/keyrings/ubuntu-bionic.gpg] http://security.ubuntu.com/ubuntu bionic-security main" > /etc/apt/sources.list.d/ubuntu-bionic.list
48- RUN echo "deb [signed-by=/etc/apt/keyrings/sovrin.gpg] https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list.d/sovrin.list
49-
50- # todo: Will be removed when Ursa is replaced
51- RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger.jfrog.io/artifactory/indy bionic master" > /etc/apt/sources.list.d/sovrin.list
45+ RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger.jfrog.io/artifactory/indy bionic master" >> /etc/apt/sources.list.d/hyperledger.list
5246
5347RUN apt-get update -y && apt-get install -y \
5448 # Python
Original file line number Diff line number Diff line change @@ -17,18 +17,15 @@ RUN apt-get update -y && apt-get install -y \
1717# Update repository signing keys
1818# --------------------------------------------------------------------------------------------------------
1919 # Hyperledger
20- RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \
21- # Sovrin
22- apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88
20+ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 &&
2321# ========================================================================================================
2422
2523# Plenum
2624# - https://github.com/hyperledger/indy-plenum/issues/1546
2725# - Needed to pick up rocksdb=5.8.8
2826RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy focal dev" >> /etc/apt/sources.list && \
2927 echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list && \
30- echo "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" >> /etc/apt/sources.list && \
31- echo "deb https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list
28+ echo "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" >> /etc/apt/sources.list
3229
3330
3431RUN apt-get update -y && apt-get install -y \
Original file line number Diff line number Diff line change @@ -25,9 +25,6 @@ RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \
2525# bionic key
2626RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 && \
2727 gpg --export 3B4FE6ACC0B21F32 > /etc/apt/keyrings/ubuntu-bionic.gpg
28- # sovrin key
29- RUN gpg --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \
30- gpg --export CE7709D068DB5E88 > /etc/apt/keyrings/sovrin.gpg
3128# ========================================================================================================
3229
3330# ToDo:
@@ -40,10 +37,7 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger.
4037
4138# todo: Will be removed when libindy will have been replace by indy-vdr, askar, and indy-credx
4239RUN echo "deb [signed-by=/etc/apt/keyrings/ubuntu-bionic.gpg] http://security.ubuntu.com/ubuntu bionic-security main" > /etc/apt/sources.list.d/ubuntu-bionic.list
43- RUN echo "deb [signed-by=/etc/apt/keyrings/sovrin.gpg] https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list.d/sovrin.list
44-
45- # todo: Will be removed when Ursa is replaced
46- RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger.jfrog.io/artifactory/indy bionic master" > /etc/apt/sources.list.d/sovrin.list
40+ RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger.jfrog.io/artifactory/indy bionic master" > /etc/apt/sources.list.d/hyperledger.list
4741
4842RUN apt update -y && apt install -y rubygems python3-pip && apt-get -y autoremove && rm -rf /var/lib/apt/lists/*
4943
Original file line number Diff line number Diff line change @@ -18,18 +18,15 @@ RUN sudo apt-get update -y && sudo apt-get install -y \
1818# Update repository signing keys
1919# --------------------------------------------------------------------------------------------------------
2020# Hyperledger
21- RUN sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \
22- # Sovrin
23- sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88
21+ RUN sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61
2422# ========================================================================================================
2523
2624# Plenum
2725# - https://github.com/hyperledger/indy-plenum/issues/1546
2826# - Needed to pick up rocksdb=5.8.8
2927RUN sudo add-apt-repository 'deb https://hyperledger.jfrog.io/artifactory/indy focal dev' && \
3028 sudo add-apt-repository 'deb http://security.ubuntu.com/ubuntu bionic-security main' && \
31- sudo add-apt-repository 'deb https://hyperledger.jfrog.io/artifactory/indy bionic master' && \
32- sudo add-apt-repository 'deb https://repo.sovrin.org/sdk/deb bionic master'
29+ sudo add-apt-repository 'deb https://hyperledger.jfrog.io/artifactory/indy bionic master'
3330
3431RUN sudo apt-get update -y && sudo apt-get install -y \
3532 # Python
Original file line number Diff line number Diff line change 33##Pre-Install
44
55 sudo apt-get update && sudo apt-get install -y apt-transport-https ca-certificates
6- sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 || sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CE7709D068DB5E88
6+ sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 || sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 9692C00E657DDE61
77 sudo echo "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" >> /etc/apt/sources.list
88 sudo echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list
99
You can’t perform that action at this time.
0 commit comments