diff --git a/.github/workflows/push-rust-services.yaml b/.github/workflows/push-rust-services.yaml index 77991117..b00d9066 100644 --- a/.github/workflows/push-rust-services.yaml +++ b/.github/workflows/push-rust-services.yaml @@ -29,10 +29,6 @@ jobs: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Install Protoc - uses: arduino/setup-protoc@v3 - with: - version: "28.x" - name: Extract metadata (tags, labels) for Docker id: meta_server uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 diff --git a/Dockerfile b/Dockerfile index e8a13a43..b28da6dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,15 @@ FROM rust:${RUST_VERSION} AS build RUN rustup default nightly-2024-02-04 RUN cargo install --git https://github.com/coral-xyz/anchor --tag v0.30.1 anchor-cli --locked +# Install protobuf (modify version as needed) +ARG PROTOC_VERSION=28.3 +RUN curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip && \ + unzip protoc-${PROTOC_VERSION}-linux-x86_64.zip -d /usr/local && \ + rm protoc-${PROTOC_VERSION}-linux-x86_64.zip + +# Add /usr/local/bin to PATH if not already present +ENV PATH="/usr/local/bin:$PATH" + # Set default toolchain RUN rustup default nightly-2024-04-10