diff options
| author | hwipl <33433250+hwipl@users.noreply.github.com> | 2020-04-18 16:23:02 +0300 |
|---|---|---|
| committer | hwipl <33433250+hwipl@users.noreply.github.com> | 2020-04-18 17:15:41 +0300 |
| commit | 2a83c13a22af4bd7b672ffe4000608c9278d8030 (patch) | |
| tree | 9d89309faf2c95fe5de06c0e47e27e62c4c40b17 /Dockerfile | |
| parent | d75efe0eac8527c8d51d94754442d7063e4b5e01 (diff) | |
Dockerfile: use regex for protobuf and grpc package names
The latest Ubuntu LTS Docker image is version 18.04 and will switch to
version 20.04 soon. The package names of libprotobuf and libgrpc differ
in version 18.04 and 20.04. As suggested by Bartosz Zieba, this patch
uses regex for installing these packages to make the Dockerfile work
with both LTS versions.
Co-authored-by: Bartosz Zieba <bartosz@zieba.pro>
Signed-off-by: hwipl <33433250+hwipl@users.noreply.github.com>
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index a2bafd30f..b8eeff458 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,8 +39,8 @@ RUN adduser murmur RUN apt-get update && apt-get install -y \ libcap2 \ libzeroc-ice3.7 \ - libprotobuf17 \ - libgrpc6 \ + '^libprotobuf[0-9]+$' \ + '^libgrpc[0-9]+$' \ libgrpc++1 \ libavahi-compat-libdnssd1 \ libqt5core5a \ |