Skip to content

Commit

Permalink
Merge pull request #60 from Concordium/fix-build
Browse files Browse the repository at this point in the history
Fix build
  • Loading branch information
abizjak authored Oct 25, 2023
2 parents ae83a5e + 9826535 commit cbff94e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
**/Dockerfile
**/Jenkinsfile
**/LICENSE
**/*.md
**/*.json
**/*.deb
**/node_modules
Expand Down
10 changes: 1 addition & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
# Build and base images are assumed to be based on the same major version of Debian.
ARG build_image
ARG base_image
ARG protoc_version=3.15.3

# Build stage.
FROM ${build_image} AS build

# Install system dependencies ('cmake' and 'g++' are dependencies of Rust crate 'prost-build').
RUN apt-get update && apt-get install -y libssl-dev pkg-config cmake g++ wget zip && rm -rf /var/lib/apt/lists/*

# Install protobuf compiler 'protoc'.
ARG protoc_version
RUN wget --no-verbose "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" \
&& mv ./bin/protoc /usr/bin/protoc \
&& chmod +x /usr/bin/protoc
RUN apt-get update && apt-get install -y libssl-dev pkg-config && rm -rf /var/lib/apt/lists/*

WORKDIR /build
COPY . .
Expand Down

0 comments on commit cbff94e

Please sign in to comment.