fix(release): fix the Dockerfile #211
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit fixes the broken Dockerfile that is used in release CI. It adds wasmedge installation step in the build, uses `xx-cargo` instead of cargo, and copies the `sed` command from Docker's build script that allows xx-cargo to be used with pkg-config in build scripts. Signed-off-by: jiaxiao zhou <[email protected]>
jprendes
reviewed
Jul 29, 2023
Dockerfile
Outdated
| @@ -25,18 +30,25 @@ COPY --link Cargo.toml ./ | |||
| COPY --link Cargo.lock ./ | |||
| ARG CRATE="" | |||
| ARG TARGETOS TARGETARCH TARGETVARIANT | |||
| RUN curl -sSf https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install.sh | bash -s -- \ | |||
There was a problem hiding this comment.
We don't need to install WasmEdge manually anymore. That's take care automatically during the build process.
jprendes
reviewed
Jul 29, 2023
Dockerfile
Outdated
| RUN --mount=type=cache,target=/usr/local/cargo/git/db \ | ||
| --mount=type=cache,target=/usr/local/cargo/registry/cache \ | ||
| --mount=type=cache,target=/usr/local/cargo/registry/index \ | ||
| --mount=type=cache,target=/build/src/target,id=runwasi-cargo-build-cache-${TARGETOS}-${TARGETARCH}${TARGETVARIANT} <<EOT | ||
| set -e | ||
| export "CARGO_NET_GIT_FETCH_WITH_CLI=true" | ||
| export RUSTFLAGS='-Clink-arg=-Wl,-rpath,$ORIGIN' |
There was a problem hiding this comment.
We are by default statically linking against wasmedge now. You can remove this.
jprendes
requested changes
Jul 29, 2023
cpuguy83
previously approved these changes
Jul 29, 2023
|
Looks like just one comment from @jprendes but otherwise LGTM. |
Signed-off-by: jiaxiao zhou <[email protected]>
jprendes
approved these changes
Jul 30, 2023
Dockerfile
Outdated
|
|
||
| FROM base AS build | ||
| SHELL ["/bin/bash", "-c"] | ||
| ARG BUILD_TAGS TARGETPLATFORM | ||
| RUN xx-apt-get install -y gcc g++ libc++6-dev zlib1g | ||
| RUN xx-apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev build-essential libelf-dev libseccomp-dev libclang-dev | ||
| RUN xx-apt-get install -y libsystemd-dev libdbus-1-dev libseccomp-dev | ||
| RUN rustup target add $(xx-info march)-unknown-$(xx-info os)-$(xx-info libc) |
There was a problem hiding this comment.
nit: Remove. xx-cargo runs rustup target add (for target platform) for you.
| @@ -36,7 +41,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/git/db \ | |||
| if [ -n "${CRATE}" ]; then | |||
| package="--package=${CRATE}" | |||
| fi | |||
| cargo build --release --target=$(xx-info march)-unknown-$(xx-info os)-$(xx-info libc) ${package} | |||
| xx-cargo build --release ${package} | |||
There was a problem hiding this comment.
nit: Remove lines 39 and 40. xx-cargo already sets those variables for you.
…bring Signed-off-by: jiaxiao zhou <[email protected]>
cpuguy83
approved these changes
Jul 31, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit fixes the broken Dockerfile that is used in release CI. It adds wasmedge installation step in the build, uses
xx-cargoinstead of cargo, and copies thesedcommand from Docker's build script that allows xx-cargo to be used with pkg-config in build scripts.Reference
FYI @cpuguy83 @jprendes