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.

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

Install pkg-config and libssl-dev on the Docker image #39

Merged
merged 3 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM ubuntu:22.04

# Constants
ARG BUILDER_NAME="multiversx/sdk-rust-contract-builder:v5.2.0"
ARG BUILDER_NAME="multiversx/sdk-rust-contract-builder:v5.3.0"
ARG VERSION_RUST="nightly-2023-05-26"
ARG VERSION_BINARYEN="version_112"
ARG DOWNLOAD_URL_BINARYEN="https://github.com/WebAssembly/binaryen/releases/download/${VERSION_BINARYEN}/binaryen-${VERSION_BINARYEN}-x86_64-linux.tar.gz"
ARG VERSION_WABT="1.0.27-1"
ARG VERSION_SC_META="0.41.0"
ARG VERSION_SC_META="0.43.3"
ARG TARGETPLATFORM

# Install system dependencies
Expand All @@ -15,7 +15,9 @@ RUN apt-get update --fix-missing && apt-get install -y \
build-essential \
git \
python3.11 python-is-python3 python3-pip \
wabt=${VERSION_WABT}
wabt=${VERSION_WABT} \
pkg-config \
libssl-dev

# Install binaryen
RUN wget -O binaryen.tar.gz ${DOWNLOAD_URL_BINARYEN} && \
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ Docker image (and wrappers) for reproducible contract builds (Rust). See [docs.m
We use `docker buildx` to build the image:

```
docker buildx build --output type=docker . -t sdk-rust-contract-builder:next -f ./Dockerfile
docker buildx build --network host --output type=docker . -t sdk-rust-contract-builder:next -f ./Dockerfile
```

Maintainers can publish the image as follows:

```
docker buildx create --name multiarch --use

docker buildx build --push --platform=linux/amd64 . -t multiversx/sdk-rust-contract-builder:next -f ./Dockerfile
docker buildx build --network host --push --platform=linux/amd64 . -t multiversx/sdk-rust-contract-builder:next -f ./Dockerfile

docker buildx rm multiarch
```
Expand Down
1 change: 1 addition & 0 deletions integration_tests/shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ def run_docker(
docker_mount_args += ["--volume", f"{RUST_REGISTRY}:/rust/registry"]
docker_mount_args += ["--volume", f"{RUST_GIT}:/rust/git"]
docker_mount_args += ["--volume", f"{RUST_TMP}:/rust/tmp"]
docker_mount_args += ["--network", "host"]

docker_args = ["docker", "run"]
docker_args += docker_mount_args
Expand Down
Loading