diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index d248564..0000000 --- a/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -ARG GO_VERSION=1.21.1 -ARG RUST_VERSION=nightly-2023-12-03 -ARG CARGO_CHEF_TAG=0.1.41 - -FROM ubuntu:20.04 - -RUN apt-get update - -# Install basic packages -RUN ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime && apt-get install -y build-essential -RUN apt-get install -y curl -RUN apt-get install -y wget -RUN apt-get install -y git -RUN apt-get install -y pkg-config - -# Install dev-packages -RUN apt-get install -y libclang-dev -RUN apt-get install -y libssl-dev -RUN apt-get install -y llvm - -# Install Rust -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -ENV PATH="/root/.cargo/bin:${PATH}" -ENV CARGO_HOME=/root/.cargo -# Add Toolchain -ARG RUST_VERSION -RUN rustup toolchain install ${RUST_VERSION} -ARG CARGO_CHEF_TAG -RUN cargo install cargo-chef --locked --version ${CARGO_CHEF_TAG} \ - && rm -rf $CARGO_HOME/registry/ - -# Install Go -ARG GO_VERSION -RUN rm -rf /usr/local/go -RUN wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz -RUN tar -C /usr/local -xzf go${GO_VERSION}.linux-amd64.tar.gz -RUN rm go${GO_VERSION}.linux-amd64.tar.gz -ENV PATH="/usr/local/go/bin:${PATH}" diff --git a/Makefile b/Makefile index fc798d5..6eb5c69 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,5 @@ fmt: goimports -w . gofumpt -l -w . -build: - docker build -t my-dev-container --platform linux/amd64 . - -run: build - docker run -it --rm -v "$(PWD):/workspace" -w /workspace my-dev-container - test: ./run_test.sh diff --git a/README.md b/README.md index cbd7d54..c21dcac 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ ## Running unit tests ``` -make run +docker pull scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 --platform linux/amd64 +docker run -it --rm -v "$(PWD):/workspace" -w /workspace scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 cd libzstd make libzstd cd .. diff --git a/run_test.sh b/run_test.sh index 15ef84b..d76bf04 100755 --- a/run_test.sh +++ b/run_test.sh @@ -2,12 +2,13 @@ # Compile libzstd cd libzstd && cargo build --release && cd .. -sudo cp -f $(pwd)/libzstd/target/release/libscroll_zstd.so $(pwd)/ -find $(pwd)/libzstd/target/release | grep libzktrie.so | xargs -I{} cp -f {} $(pwd)/ +sudo mkdir -p /scroll/lib/ +sudo cp -f $(pwd)/libzstd/target/release/libscroll_zstd.so /scroll/lib/ +find $(pwd)/libzstd/target/release -name 'libzktrie.so' | xargs -I{} sudo cp -f {} /scroll/lib/ # Set the environment variable -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd) -export CGO_LDFLAGS="-L$(pwd) -Wl,-rpath=$(pwd)" +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/scroll/lib/ +export CGO_LDFLAGS="-L/scroll/lib/ -Wl,-rpath=/scroll/lib/" # Run module tests go test -v -race -gcflags="-l" -ldflags="-s=false" -coverprofile=coverage.txt -covermode=atomic ./...