Skip to content

Commit c87dcf1

Browse files
Use the new apt package cli in all Dockerfile and use the same version of gemm pkg
Signed-off-by: GuillaumeBourque-QC <[email protected]>
1 parent 0563960 commit c87dcf1

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.devcontainer/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ RUN apt-get update -y && apt-get install -y \
2020
# --------------------------------------------------------------------------------------------------------
2121
# Hyperledger
2222
RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \
23-
gpg --export 9692C00E657DDE61 > /etc/apt/trusted.gpg.d/hyperledger.gpg
23+
gpg --export 9692C00E657DDE61 > /etc/apt/keyrings/hyperledger.gpg
2424
# ========================================================================================================
2525

2626
# Plenum
2727
# - https://github.com/hyperledger/indy-plenum/issues/1546
2828
# - Needed to pick up rocksdb=5.8.8
29-
RUN echo "deb [signed-by=/etc/apt/trusted.gpg.d/hyperledger.gpg] https://hyperledger.jfrog.io/artifactory/indy jammy dev rc" > /etc/apt/sources.list.d/hyperledger.list
29+
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
3030

3131
RUN apt update -y && apt install -y \
3232
# Python
@@ -60,7 +60,8 @@ RUN pip3 install -U \
6060
Cython==0.29.36
6161

6262
# install fpm
63-
RUN gem install --no-document rake dotenv:2.8.1 fpm:1.14.2
63+
RUN gem install --no-document rake dotenv:2.8.1 fpm:1.15.0 && \
64+
pip3 install Cython==0.29.36
6465

6566
RUN apt -y autoremove \
6667
&& rm -rf /var/lib/apt/lists/*

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ubuntu:22.04
33
ARG uid=1000
44
ARG user=indy
55

6-
RUN apt-get update -y && apt-get install -y \
6+
RUN apt update -y && apt install -y \
77
# common stuff
88
git \
99
wget \
@@ -15,7 +15,7 @@ RUN apt-get update -y && apt-get install -y \
1515
jq
1616

1717
# ========================================================================================================
18-
# Update repository signing keys
18+
# Get repository signing keys
1919
# --------------------------------------------------------------------------------------------------------
2020
# Hyperledger
2121
RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \

build-scripts/ubuntu-2204/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN apt update -y && apt install -y \
1313
apt-utils
1414

1515
# ========================================================================================================
16-
# Update repository signing keys
16+
# Get repository signing keys
1717
# --------------------------------------------------------------------------------------------------------
1818
# Hyperledger
1919
RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \
@@ -62,7 +62,8 @@ RUN pip3 install -U \
6262
pyzmq==26.2.1
6363

6464
# install fpm
65-
RUN gem install --no-document rake dotenv:2.8.1 fpm:1.14.2
65+
RUN gem install --no-document rake dotenv:2.8.1 fpm:1.15.0 && \
66+
pip3 install Cython==0.29.36
6667

6768
RUN apt -y autoremove \
6869
&& rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)