Skip to content

Commit 03c89c6

Browse files
chore: update image to use arg polkadot version
1 parent e12686d commit 03c89c6

File tree

6 files changed

+28
-14
lines changed

6 files changed

+28
-14
lines changed

devnet/alice.Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33

44
FROM golang:1.17
55

6-
# Using a genesis file with 3 authority nodes (alice, bob, charlie) generated using polkadot v0.9.10
7-
ARG CHAIN=3-auth-node-0.9.10
6+
ARG POLKADOT_VERSION=v0.9.10
7+
8+
# Using a genesis file with 3 authority nodes (alice, bob, charlie) generated using polkadot $POLKADOT_VERSION
9+
ARG CHAIN=3-auth-node-${POLKADOT_VERSION}
810
ARG DD_API_KEY=somekey
911

1012
ENV DD_API_KEY=${DD_API_KEY}

devnet/bob.Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
# Copyright 2021 ChainSafe Systems (ON)
22
# SPDX-License-Identifier: LGPL-3.0-only
33

4+
45
FROM golang:1.17
56

6-
# Using a genesis file with 3 authority nodes (alice, bob, charlie) generated using polkadot v0.9.10
7-
ARG CHAIN=3-auth-node-0.9.10
7+
ARG POLKADOT_VERSION=v0.9.10
8+
9+
# Using a genesis file with 3 authority nodes (alice, bob, charlie) generated using polkadot $POLKADOT_VERSION
10+
ARG CHAIN=3-auth-node-${POLKADOT_VERSION}
811
ARG DD_API_KEY=somekey
912

1013
ENV DD_API_KEY=${DD_API_KEY}

devnet/chain/3-auth-node-0.9.10/genesis-raw.json renamed to devnet/chain/3-auth-node-v0.9.10/genesis-raw.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,4 @@
154154
"childrenDefault": {}
155155
}
156156
}
157-
}
157+
}

devnet/chain/3-auth-node-0.9.10/genesis.json renamed to devnet/chain/3-auth-node-v0.9.10/genesis.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,4 +194,4 @@
194194
}
195195
}
196196
}
197-
}
197+
}

devnet/substrate_alice.Dockerfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Copyright 2022 ChainSafe Systems (ON)
22
# SPDX-License-Identifier: LGPL-3.0-only
33

4+
ARG POLKADOT_VERSION=v0.9.10
5+
46
FROM golang:1.17 as openmetrics
57
ARG METRICS_NAMESPACE=substrate.local.devnet
68

@@ -12,16 +14,19 @@ RUN go mod download
1214
COPY ./devnet .
1315
RUN go run cmd/update-dd-agent-confd/main.go -n=${METRICS_NAMESPACE} -t=key:alice > conf.yaml
1416

15-
FROM parity/polkadot:v0.9.17
17+
FROM parity/polkadot:${POLKADOT_VERSION}
1618

17-
# Using a genesis file with 3 authority nodes (alice, bob, charlie) generated using polkadot v0.9.10
18-
ARG CHAIN=3-auth-node-0.9.10
19+
ARG POLKADOT_VERSION
20+
# Using a genesis file with 3 authority nodes (alice, bob, charlie) generated using polkadot $POLKADOT_VERSION
21+
ARG CHAIN=3-auth-node-${POLKADOT_VERSION}
1922
ARG DD_API_KEY=somekey
2023

2124
ENV DD_API_KEY=${DD_API_KEY}
2225
ENV CHAIN=${CHAIN}
2326

2427
USER root
28+
RUN gpg --recv-keys --keyserver hkps://keys.mailvelope.com 9D4B2B6EB8F97156D19669A9FF0812D491B96798
29+
RUN gpg --export 9D4B2B6EB8F97156D19669A9FF0812D491B96798 > /usr/share/keyrings/parity.gpg
2530
RUN apt update && apt install -y curl && rm -r /var/cache/* /var/lib/apt/lists/*
2631

2732
WORKDIR /cross-client

devnet/substrate_bob.Dockerfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright 2022 ChainSafe Systems (ON)
22
# SPDX-License-Identifier: LGPL-3.0-only
3-
3+
ARG POLKADOT_VERSION=v0.9.10
44
FROM golang:1.17 as openmetrics
55

66
ARG METRICS_NAMESPACE=substrate.local.devnet
@@ -13,18 +13,22 @@ RUN go mod download
1313
COPY ./devnet .
1414
RUN go run cmd/update-dd-agent-confd/main.go -n=${METRICS_NAMESPACE} -t=key:alice > conf.yaml
1515

16-
FROM parity/polkadot:v0.9.17
16+
FROM parity/polkadot:${POLKADOT_VERSION}
1717

18-
ARG key
19-
# Using a genesis file with 3 authority nodes (alice, bob, charlie) generated using polkadot v0.9.10
20-
ARG CHAIN=3-auth-node-0.9.10
18+
ARG POLKADOT_VERSION
19+
# Using a genesis file with 3 authority nodes (alice, bob, charlie) generated using polkadot $POLKADOT_VERSION
20+
ARG CHAIN=3-auth-node-${POLKADOT_VERSION}
2121
ARG DD_API_KEY=somekey
22+
ARG key
2223

2324
ENV DD_API_KEY=${DD_API_KEY}
2425
ENV CHAIN=${CHAIN}
2526
ENV key=${key}
2627

2728
USER root
29+
RUN gpg --recv-keys --keyserver hkps://keys.mailvelope.com 9D4B2B6EB8F97156D19669A9FF0812D491B96798
30+
RUN gpg --export 9D4B2B6EB8F97156D19669A9FF0812D491B96798 > /usr/share/keyrings/parity.gpg
31+
2832
RUN apt update && apt install -y curl && rm -r /var/cache/* /var/lib/apt/lists/*
2933

3034
WORKDIR /cross-client

0 commit comments

Comments
 (0)