Skip to content

Commit 587dd8e

Browse files
swcurranswcurran
authored
Merge pull request #1905 from GuillaumeBourque-QC/ubuntu-22.04
Ubuntu 22.04 new apt command and new repo file
2 parents 311689d + c87dcf1 commit 587dd8e

File tree

5 files changed

+43
-64
lines changed

5 files changed

+43
-64
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.205.2/containers/ubuntu/.devcontainer/base.Dockerfile
1+
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/main/containers/ubuntu/.devcontainer/base.Dockerfile
22

3-
# [Choice] Ubuntu version (use hirsuite or bionic on local arm64/Apple Silicon): hirsute, focal, bionic
4-
ARG VARIANT="focal"
3+
# [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
4+
ARG VARIANT="ubuntu-22.04"
55
FROM mcr.microsoft.com/vscode/devcontainers/base:${VARIANT}
66

77
RUN apt-get update -y && apt-get install -y \
@@ -16,23 +16,19 @@ RUN apt-get update -y && apt-get install -y \
1616
jq
1717

1818
# ========================================================================================================
19-
# Update repository signing keys
19+
# Get repository signing keys
2020
# --------------------------------------------------------------------------------------------------------
2121
# Hyperledger
22-
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \
23-
# Sovrin
24-
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88
22+
RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \
23+
gpg --export 9692C00E657DDE61 > /etc/apt/keyrings/hyperledger.gpg
2524
# ========================================================================================================
2625

2726
# Plenum
2827
# - https://github.com/hyperledger/indy-plenum/issues/1546
2928
# - Needed to pick up rocksdb=5.8.8
30-
RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy focal dev" >> /etc/apt/sources.list && \
31-
echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list && \
32-
echo "deb https://repo.sovrin.org/deb bionic master" >> /etc/apt/sources.list && \
33-
echo "deb https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.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
3430

35-
RUN apt-get update -y && apt-get install -y \
31+
RUN apt update -y && apt install -y \
3632
# Python
3733
python3-pip \
3834
python3-nacl \
@@ -53,22 +49,19 @@ RUN apt-get update -y && apt-get install -y \
5349
gcc \
5450
make \
5551
# Indy Node and Plenum
56-
libssl1.0.0 \
57-
ursa=0.3.2-1 \
58-
# Indy SDK
59-
libindy=1.15.0~1625-bionic \
60-
# Need to move libursa.so to parent dir
61-
&& mv /usr/lib/ursa/* /usr/lib && rm -rf /usr/lib/ursa
52+
# Indy SDK is not used anymore
53+
#libindy \
54+
libssl3
6255

6356
RUN pip3 install -U \
6457
# Required by setup.py
65-
setuptools==50.3.2 \
66-
'pyzmq==22.3.0' \
58+
setuptools==75.8.0 \
59+
pyzmq==26.2.1 \
6760
Cython==0.29.36
6861

69-
7062
# install fpm
71-
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
7265

73-
RUN apt-get -y autoremove \
66+
RUN apt -y autoremove \
7467
&& rm -rf /var/lib/apt/lists/*

‎.devcontainer/devcontainer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"name": "Ubuntu",
55
"build": {
66
"dockerfile": "Dockerfile",
7-
// Update 'VARIANT' to pick an Ubuntu version: hirsute, focal, bionic
7+
// Update 'VARIANT' to pick an Ubuntu version: jammy, hirsute, focal, bionic
88
// Use hirsute or bionic on local arm64/Apple Silicon.
9-
"args": { "VARIANT": "focal" }
9+
"args": { "VARIANT": "jammy" }
1010
},
1111

1212
"customizations": {

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

Lines changed: 6 additions & 16 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,14 +15,11 @@ 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
21-
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \
22-
# Sovrin
23-
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \
24-
# Bionic-Security
25-
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
21+
RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \
22+
gpg --export 9692C00E657DDE61 > /etc/apt/keyrings/hyperledger.gpg
2623
# ========================================================================================================
2724

2825
# ToDo:
@@ -31,16 +28,9 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 &&
3128
# Plenum
3229
# - https://github.com/hyperledger/indy-plenum/issues/1546
3330
# - Needed to pick up rocksdb=5.8.8
34-
RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy jammy dev rc" >> /etc/apt/sources.list && \
35-
echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list && \
36-
echo "deb https://repo.sovrin.org/deb bionic master" >> /etc/apt/sources.list && \
37-
echo "deb https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list
31+
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
3832

39-
RUN apt-get update -y && apt-get install -y \
40-
rubygems \
41-
python3-pip && \
42-
apt-get -y autoremove && \
43-
rm -rf /var/lib/apt/lists/*
33+
RUN apt update -y && apt install -y rubygems python3-pip && apt-get -y autoremove && rm -rf /var/lib/apt/lists/*
4434

4535
# install fpm
4636
RUN gem install --no-document rake dotenv:2.8.1 fpm:1.15.0 && \

‎.github/workflows/releasepr.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
paths:
66
- '!**'
77
- "indy_node/__version__.json"
8+
workflow_dispatch:
89

910
jobs:
1011
release-infos:

‎build-scripts/ubuntu-2204/Dockerfile‎

Lines changed: 18 additions & 23 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 \
@@ -13,28 +13,19 @@ RUN apt-get update -y && apt-get install -y \
1313
apt-utils
1414

1515
# ========================================================================================================
16-
# Update repository signing keys
16+
# Get repository signing keys
1717
# --------------------------------------------------------------------------------------------------------
1818
# Hyperledger
19-
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \
20-
# Sovrin
21-
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \
22-
# Bionic-Security
23-
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
19+
RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \
20+
gpg --export 9692C00E657DDE61 > /etc/apt/keyrings/hyperledger.gpg
2421
# ========================================================================================================
2522

2623
# Plenum
2724
# - https://github.com/hyperledger/indy-plenum/issues/1546
2825
# - Needed to pick up rocksdb=5.8.8
29-
RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy jammy dev" >> /etc/apt/sources.list && \
30-
echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list && \
31-
echo "deb https://repo.sovrin.org/deb bionic master" >> /etc/apt/sources.list && \
32-
echo "deb https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list
26+
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
3327

34-
# Sovrin
35-
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88
36-
37-
RUN apt-get update -y && apt-get install -y \
28+
RUN apt update -y && apt install -y \
3829
# Python
3930
python3-pip \
4031
python3-nacl \
@@ -55,21 +46,25 @@ RUN apt-get update -y && apt-get install -y \
5546
gcc \
5647
make \
5748
# Indy Node and Plenum
58-
libssl1.0.0 \
59-
ursa=0.3.2-1 \
49+
libssl3
50+
# Indy Node and Plenum
51+
# Indy SDK is not used anymore
52+
#libindy \
53+
# rsa=0.3.2-1 \
6054
# Indy SDK
61-
libindy=1.15.0~1625-bionic \
55+
# libindy=1.15.0~1625-bionic \
6256
# Need to move libursa.so to parent dir
63-
&& mv /usr/lib/ursa/* /usr/lib && rm -rf /usr/lib/ursa
57+
# && mv /usr/lib/ursa/* /usr/lib && rm -rf /usr/lib/ursa
6458

6559
RUN pip3 install -U \
6660
# Required by setup.py
67-
setuptools==50.3.2 \
68-
'pyzmq==22.3.0'
61+
setuptools==75.8.0 \
62+
pyzmq==26.2.1
6963

7064
# install fpm
71-
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
7267

73-
RUN apt-get -y autoremove \
68+
RUN apt -y autoremove \
7469
&& rm -rf /var/lib/apt/lists/*
7570

0 commit comments

Comments
 (0)