Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
fuxingloh committed Mar 18, 2024
1 parent f442a57 commit 04f8c52
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ concurrency:
permissions:
contents: read

env:
BUILDKIT_PROGRESS: plain

jobs:
build:
name: Build
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
permissions:
contents: read

env:
BUILDKIT_PROGRESS: plain

jobs:
version:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -96,4 +99,4 @@ jobs:

- run: pnpm -r exec npm version ${{ needs.version.outputs.result }} --git-tag-version=false

- run: pnpm turbo run push:docker --filter=${{ matrix.package }} --concurrency=1
- run: pnpm --filter=${{ matrix.package }} run push:docker
1 change: 1 addition & 0 deletions .idea/dictionaries/fuxing.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 9 additions & 4 deletions packages/solana-container/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM debian:bullseye as builder
FROM debian:bookworm as builder

# Install os deps
RUN apt update && \
apt-get install -y build-essential clang cmake curl libudev-dev pkg-config && \
apt-get install -y build-essential clang cmake curl libudev-dev pkg-config protobuf-compiler && \
rm -rf /var/lib/apt/lists/*

# Setup rust
Expand All @@ -17,14 +17,19 @@ RUN curl https://codeload.github.com/solana-labs/solana/tar.gz/refs/tags/v$SOLAN
RUN mv solana-$SOLANA_VERSION /workspace/solana

WORKDIR /workspace/solana
RUN cargo fetch

# Do not optimize the build to reduce the build time, since this is testcontainers not to be used in production.
ENV RUSTFLAGS="-C opt-level=0"
RUN cargo build --bin solana-test-validator --release

FROM debian:bullseye as final
FROM debian:bookworm as runner

RUN apt update && \
apt-get install -y bzip2 && \
apt-get install -y bzip2 libssl-dev && \
rm -rf /var/lib/apt/lists/*

COPY --from=builder /workspace/solana/target/release/solana-test-validator /bin/solana-test-validator

EXPOSE 8899 8900
CMD ["solana-test-validator"]
2 changes: 1 addition & 1 deletion packages/solana-testcontainers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"build": "tsc --project tsconfig.build.json",
"clean": "tsc --build --clean",
"lint": "eslint .",
"test": "jest --passWithNoTests"
"test": "jest --passWithNoTests --forceExit"
},
"lint-staged": {
"*": [
Expand Down

0 comments on commit 04f8c52

Please sign in to comment.