Skip to content

Commit cbff94e

Browse files
authored
Merge pull request #60 from Concordium/fix-build
Fix build
2 parents ae83a5e + 9826535 commit cbff94e

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
**/Dockerfile
44
**/Jenkinsfile
55
**/LICENSE
6-
**/*.md
76
**/*.json
87
**/*.deb
98
**/node_modules

Dockerfile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
# Build and base images are assumed to be based on the same major version of Debian.
22
ARG build_image
33
ARG base_image
4-
ARG protoc_version=3.15.3
54

65
# Build stage.
76
FROM ${build_image} AS build
87

98
# Install system dependencies ('cmake' and 'g++' are dependencies of Rust crate 'prost-build').
10-
RUN apt-get update && apt-get install -y libssl-dev pkg-config cmake g++ wget zip && rm -rf /var/lib/apt/lists/*
11-
12-
# Install protobuf compiler 'protoc'.
13-
ARG protoc_version
14-
RUN wget --no-verbose "https://github.com/protocolbuffers/protobuf/releases/download/v${protoc_version}/protoc-${protoc_version}-linux-x86_64.zip" \
15-
&& unzip "protoc-${protoc_version}-linux-x86_64.zip" \
16-
&& mv ./bin/protoc /usr/bin/protoc \
17-
&& chmod +x /usr/bin/protoc
9+
RUN apt-get update && apt-get install -y libssl-dev pkg-config && rm -rf /var/lib/apt/lists/*
1810

1911
WORKDIR /build
2012
COPY . .

0 commit comments

Comments
 (0)