Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix Oasis CLI in sapphire-dev Docker image #488

Merged
merged 2 commits into from
Dec 7, 2023
Merged

fix: Fix Oasis CLI in sapphire-dev Docker image #488

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b899c7
fix: Fix Oasis CLI in sapphire-dev Docker image
abukosek Dec 6, 2023
37e7a57
feat: Bump Sapphire paratime version to 0.7.0
abukosek Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions docker/sapphire-dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,15 @@ RUN cd oasis-web3-gateway && make && strip -S -x oasis-web3-gateway docker/commo
FROM ghcr.io/oasisprotocol/oasis-core-dev:stable-23.0.x AS oasis-core-dev

ENV OASIS_UNSAFE_SKIP_KM_POLICY=1
ENV OASIS_CLI_VERSION=0.7.1

RUN git clone https://github.com/oasisprotocol/oasis-core.git --branch stable/23.0.x --depth 1 \
&& cd oasis-core/tests/runtimes/simple-keymanager \
&& cargo build --release
&& cargo build --release \
&& cd ../../../../ \
&& git clone https://github.com/oasisprotocol/cli.git --branch v${OASIS_CLI_VERSION} --depth 1 \
&& cd cli \
&& make CGO_ENABLED=0

# Build sapphire-dev
FROM postgres:16-alpine
Expand All @@ -20,8 +25,7 @@ RUN apk add --no-cache bash gcompat libseccomp jq binutils \

# Docker-specific variables
ENV OASIS_CORE_VERSION=23.0.9
ENV OASIS_CLI_VERSION=0.6.0
ENV PARATIME_VERSION=0.7.0-testnet
ENV PARATIME_VERSION=0.7.0
ENV PARATIME_NAME=sapphire
ENV GATEWAY__CHAIN_ID=0x5afd

Expand All @@ -43,6 +47,9 @@ ARG VERSION
# simple-keymanager
COPY --from=oasis-core-dev /oasis-core/target/release/simple-keymanager ${KEYMANAGER_BINARY}

# cli
COPY --from=oasis-core-dev /cli/oasis /oasis

# oasis-web3-gateway binary, config, spinup-* scripts and staking_genesis.json.
COPY --from=oasis-web3-gateway /go/oasis-web3-gateway/oasis-web3-gateway ${OASIS_WEB3_GATEWAY}
COPY --from=oasis-web3-gateway /go/oasis-web3-gateway/docker/common/oasis-deposit/oasis-deposit ${OASIS_DEPOSIT}
Expand All @@ -66,18 +73,18 @@ RUN wget --quiet "https://github.com/oasisprotocol/oasis-core/releases/download/
&& chmod a+x "runtime.elf" \
&& rm "paratime.orc" \
&& echo "" \
&& echo "Configure oasis-cli." \
&& wget --quiet "https://github.com/oasisprotocol/cli/releases/download/v${OASIS_CLI_VERSION}/oasis_cli_${OASIS_CLI_VERSION}_linux_amd64.tar.gz" \
&& tar -xvf "/oasis_cli_${OASIS_CLI_VERSION}_linux_amd64.tar.gz" \
&& mv "/oasis_cli_${OASIS_CLI_VERSION}_linux_amd64/oasis" / \
&& rm -rf "/oasis_cli_${OASIS_CLI_VERSION}_linux_amd64/" \
&& rm -rf "/oasis_cli_${OASIS_CLI_VERSION}_linux_amd64.tar.gz" \
&& echo "" \
&& echo "Write VERSION information." \
&& echo "${VERSION}" > /VERSION \
&& strip -S -x /oasis-net-runner /oasis-node /oasis /simple-keymanager \
&& strip -S -x ${OASIS_NET_RUNNER} ${OASIS_NODE} /oasis /simple-keymanager \
&& echo "" \
&& ls -l / \
&& echo "" \
&& echo "*** Oasis Node:" \
&& ${OASIS_NODE} --version \
&& echo "" \
&& ls -l /
&& echo "*** Oasis CLI:" \
&& /oasis --version \
&& echo ""

# Web3 gateway http and ws ports.
EXPOSE 8545/tcp
Expand Down
Loading