diff options
| author | Robert Adam <dev@robert-adam.de> | 2020-04-18 17:43:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-18 17:43:21 +0300 |
| commit | 60677690b75b6f187911b33db14eb0a8be4899ff (patch) | |
| tree | 9d89309faf2c95fe5de06c0e47e27e62c4c40b17 | |
| parent | 2c22eec08525d88cf275b4bc4a1a4bc671409ff2 (diff) | |
| parent | 2a83c13a22af4bd7b672ffe4000608c9278d8030 (diff) | |
Merge pull request #4074: Dockerfile: update ubuntu version to latest
Building a docker image with the current Dockerfile seems to run into
issues caused by not finding files on the Ubuntu disco repositories
anymore. So, this patch updates the Ubuntu version in the Dockerfile
from disco to latest.
| -rw-r--r-- | Dockerfile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile index 08c117dc4..b8eeff458 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:disco +FROM ubuntu:latest # needed to install tzdata in disco ENV DEBIAN_FRONTEND=noninteractive @@ -33,14 +33,14 @@ RUN qmake -recursive main.pro CONFIG+="no-client grpc" RUN make release # Clean distribution stage -FROM ubuntu:disco +FROM ubuntu:latest 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 \ |