Skip to content

Commit ea0a28d

Browse files
jnaviaskjnaviask
authored
Fix docker and add new version. (hicommonwealth#321)
1 parent ce7500d commit ea0a28d

5 files changed

Lines changed: 34 additions & 52 deletions

File tree

‎docker/Dockerfile‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
FROM ubuntu as builder
22

3-
LABEL maintainer="eliott@nuclei.studio"
3+
LABEL maintainer="jake@commonwealth.im"
44

55
ARG RUST_VERSION=nightly-2020-10-06
66
ARG PROFILE=release
77
ARG GIT_REPO=https://github.com/hicommonwealth/edgeware-node
8-
ARG GIT_BRANCH=v3.2.0
8+
ARG GIT_BRANCH=v3.3.3
99
ARG BINARY_NAME=edgeware
1010
ARG PACKAGE_NAME=edgeware-cli
1111

@@ -18,30 +18,30 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
1818
pkg-config
1919

2020
# rustup is down for now -- using the raw github page instead
21-
RUN curl https://raw.githubusercontent.com/rust-lang/rustup/master/rustup-init.sh -sSf | sh -s -- -y && \
22-
export PATH=$PATH:$HOME/.cargo/bin && \
23-
git clone ${GIT_REPO} source && \
24-
cd source && \
25-
git checkout ${GIT_BRANCH} && \
26-
git submodule update --init --recursive && \
27-
rustup default stable && \
28-
rustup uninstall nightly && \
29-
rustup toolchain install ${RUST_VERSION} && \
30-
rustup target add wasm32-unknown-unknown --toolchain ${RUST_VERSION} && \
31-
cargo build -p ${PACKAGE_NAME} --${PROFILE} && \
32-
cp target/${PROFILE}/${BINARY_NAME} /node
21+
RUN curl https://raw.githubusercontent.com/rust-lang/rustup/master/rustup-init.sh -sSf | sh -s -- -y
22+
# ENV PATH=$PATH:$HOME/.cargo/bin
23+
RUN git clone ${GIT_REPO} source && cd source && git checkout ${GIT_BRANCH}
24+
RUN $HOME/.cargo/bin/rustup default stable
25+
RUN $HOME/.cargo/bin/rustup uninstall nightly
26+
RUN $HOME/.cargo/bin/rustup toolchain install ${RUST_VERSION}
27+
RUN $HOME/.cargo/bin/rustup target add wasm32-unknown-unknown --toolchain ${RUST_VERSION}
28+
RUN cd source && $HOME/.cargo/bin/cargo build -p ${PACKAGE_NAME} --${PROFILE}
29+
RUN cp source/target/${PROFILE}/${BINARY_NAME} /node
30+
RUN cp -r source/chains /chains
3331

3432
# ===== SECOND STAGE ======
3533

3634
FROM ubuntu
3735

38-
COPY --from=builder /node /usr/local/bin
36+
COPY --from=builder /node /data/node
37+
COPY --from=builder /chains /data/chains
3938

4039
# install curl in the event we want to interact with the local rpc
4140
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl
4241
RUN useradd --create-home runner
4342

4443
USER runner
44+
4545
EXPOSE 30333 9933 9944
4646

47-
ENTRYPOINT ["node"]
47+
ENTRYPOINT ["/data/node"]

‎docker/Dockerfile.local‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
FROM ubuntu as builder
22

3-
LABEL maintainer="eliott@nuclei.studio"
3+
LABEL maintainer="jake@commonwealth.im"
44

55
ARG RUST_VERSION=nightly-2020-10-06
66
ARG PROFILE=release
7+
ARG GIT_REPO=https://github.com/hicommonwealth/edgeware-node
8+
ARG GIT_BRANCH=v3.3.3
79
ARG BINARY_NAME=edgeware
810
ARG PACKAGE_NAME=edgeware-cli
911

@@ -18,28 +20,28 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
1820
COPY . /edgeware
1921

2022
# rustup is down for now -- using the raw github page instead
21-
RUN curl https://raw.githubusercontent.com/rust-lang/rustup/master/rustup-init.sh -sSf | sh -s -- -y && \
22-
export PATH=$PATH:$HOME/.cargo/bin && \
23-
cd source && \
24-
git submodule update --init --recursive && \
25-
rustup default stable && \
26-
rustup uninstall nightly && \
27-
rustup toolchain install ${RUST_VERSION} && \
28-
rustup target add wasm32-unknown-unknown --toolchain ${RUST_VERSION} && \
29-
cargo build -p ${PACKAGE_NAME} --${PROFILE} && \
30-
cp target/${PROFILE}/${BINARY_NAME} /node
23+
RUN curl https://raw.githubusercontent.com/rust-lang/rustup/master/rustup-init.sh -sSf | sh -s -- -y
24+
RUN $HOME/.cargo/bin/rustup default stable
25+
RUN $HOME/.cargo/bin/rustup uninstall nightly
26+
RUN $HOME/.cargo/bin/rustup toolchain install ${RUST_VERSION}
27+
RUN $HOME/.cargo/bin/rustup target add wasm32-unknown-unknown --toolchain ${RUST_VERSION}
28+
RUN cd /edgeware && $HOME/.cargo/bin/cargo build -p ${PACKAGE_NAME} --${PROFILE}
29+
RUN cd /edgeware/target/${PROFILE}/${BINARY_NAME} /node
30+
RUN cp -r /edgeware/chains /chains
3131

3232
# ===== SECOND STAGE ======
3333

3434
FROM ubuntu
3535

36-
COPY --from=builder /node /usr/local/bin
36+
COPY --from=builder /node /data/node
37+
COPY --from=builder /chains /data/chains
3738

3839
# install curl in the event we want to interact with the local rpc
3940
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl
4041
RUN useradd --create-home runner
4142

4243
USER runner
44+
4345
EXPOSE 30333 9933 9944
4446

45-
ENTRYPOINT ["node"]
47+
ENTRYPOINT ["/data/node"]

‎docker/beresheet.yml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎docker/docker-compose.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
version: '3.3'
22
services:
33
edgeware:
4-
image: hicommonwealth/edgeware:v3.2.0
4+
image: hicommonwealth/edgeware:v3.3.3
55
logging:
66
driver: "json-file"
77
options:
88
max-size: "100M"
99
max-file: "2"
10-
volumes:
11-
- ./data_edgeware:/data/chains
1210
ports:
1311
- "127.0.0.1:9933:9933"
1412
- "127.0.0.1:9944:9944"

‎docker/mainnet.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
version: '3.3'
22
services:
33
edgeware:
4-
image: hicommonwealth/edgeware:v3.2.0
4+
image: hicommonwealth/edgeware:v3.3.3
55
logging:
66
driver: "json-file"
77
options:
88
max-size: "100M"
99
max-file: "2"
10-
volumes:
11-
- ./data_edg_mainnet:/data/chains
1210
ports:
1311
- "127.0.0.1:9933:9933"
1412
- "127.0.0.1:9944:9944"
1513
- "127.0.0.1:30333:30333"
16-
command: ['--chain', 'edgeware', '--name', 'substrate_playground', '--ws-external', '--rpc-external', '--rpc-cors', 'all' ]
14+
command: ['--chain', '/data/chains/mainnet.chainspec.json', '--name', 'docker_compose_mainnet', '--ws-external', '--rpc-external', '--rpc-cors', 'all' ]

0 commit comments

Comments
 (0)