Skip to content

Commit f472ad5

Browse files
committed
Reorder repo references to fix build issues.
Signed-off-by: Wade Barnes <wade@neoterictech.ca>
1 parent ef88963 commit f472ad5

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

.devcontainer/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 && \
3636
# - Eliminate dependency on obsolete bionic repositories.
3737

3838
# Plenum
39-
# - https://github.com/hyperledger/indy-plenum/issues/1546
40-
# - Needed to pick up rocksdb=5.8.8
41-
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
42-
4339
# todo: Will be removed when libindy will have been replace by indy-vdr, askar, and indy-credx
4440
RUN 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
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
41+
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
42+
43+
# - https://github.com/hyperledger/indy-plenum/issues/1546
44+
# - Needed to pick up rocksdb=5.8.8
45+
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
4646

4747
RUN apt-get update -y && apt-get install -y \
4848
# Python

.github/workflows/build/Dockerfile.ubuntu-2004

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 &&
2323
# Plenum
2424
# - https://github.com/hyperledger/indy-plenum/issues/1546
2525
# - Needed to pick up rocksdb=5.8.8
26-
RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy focal dev" >> /etc/apt/sources.list && \
27-
echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list && \
28-
echo "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" >> /etc/apt/sources.list
29-
26+
RUN echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list && \
27+
echo "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" >> /etc/apt/sources.list && \
28+
echo "deb https://hyperledger.jfrog.io/artifactory/indy focal dev" >> /etc/apt/sources.list
3029

3130
RUN apt-get update -y && apt-get install -y \
3231
# Python

.github/workflows/build/Dockerfile.ubuntu-2204

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,16 @@ RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 && \
3131
# - Eliminate dependency on obsolete bionic repositories.
3232

3333
# Plenum
34-
# - https://github.com/hyperledger/indy-plenum/issues/1546
35-
# - Needed to pick up rocksdb=5.8.8
36-
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
37-
3834
# todo: Will be removed when libindy will have been replace by indy-vdr, askar, and indy-credx
3935
RUN 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
4036
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
4137

38+
# - https://github.com/hyperledger/indy-plenum/issues/1546
39+
# - Needed to pick up rocksdb=5.8.8
40+
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
41+
4242
RUN apt update -y && apt install -y rubygems python3-pip && apt-get -y autoremove && rm -rf /var/lib/apt/lists/*
4343

4444
# install fpm
4545
RUN gem install --no-document dotenv:2.8.1 fpm:1.15.0 && \
4646
pip3 install Cython==0.29.36
47-

.gitpod.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ RUN sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE
2424
# Plenum
2525
# - https://github.com/hyperledger/indy-plenum/issues/1546
2626
# - Needed to pick up rocksdb=5.8.8
27-
RUN sudo add-apt-repository 'deb https://hyperledger.jfrog.io/artifactory/indy focal dev' && \
28-
sudo add-apt-repository 'deb http://security.ubuntu.com/ubuntu bionic-security main' && \
29-
sudo add-apt-repository 'deb https://hyperledger.jfrog.io/artifactory/indy bionic master'
27+
RUN echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list && \
28+
echo "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" >> /etc/apt/sources.list && \
29+
echo "deb https://hyperledger.jfrog.io/artifactory/indy focal dev" >> /etc/apt/sources.list
3030

3131
RUN sudo apt-get update -y && sudo apt-get install -y \
3232
# Python

0 commit comments

Comments
 (0)