diff options
| -rw-r--r-- | scripts/docker/trusty-qt512/Dockerfile | 6 | ||||
| -rw-r--r-- | scripts/docker/trusty-qt512/ubuntu-esm-infra-trusty | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/scripts/docker/trusty-qt512/Dockerfile b/scripts/docker/trusty-qt512/Dockerfile index b943461f5..95310689d 100644 --- a/scripts/docker/trusty-qt512/Dockerfile +++ b/scripts/docker/trusty-qt512/Dockerfile @@ -1,6 +1,10 @@ FROM ubuntu:14.04 LABEL Description="Trusty with Qt 5.12 and Subsurface build deps" +# right now (2019-11-27) the upstream image is broken +# use workaround from https://bugs.launchpad.net/ubuntu/+source/ubuntu-advantage-tools/+bug/1854202 +ADD ubuntu-esm-infra-trusty /etc/apt/preferences.d/ubuntu-esm-infra-trusty + # that's a lot of packages. Needed for the Qt installer, for QtWebKit # and for SmartTrak # the awkward start is because we need something newer than the default @@ -74,4 +78,4 @@ RUN git clone git://github.com/Subsurface-divelog/subsurface RUN bash -e -x ./subsurface/scripts/build.sh -desktop -create-appdir -build-with-webkit # remove the source, but keep the install-root -RUN rm -rf subsurface libgit2 googlemaps grantlee
\ No newline at end of file +RUN rm -rf subsurface libgit2 googlemaps grantlee diff --git a/scripts/docker/trusty-qt512/ubuntu-esm-infra-trusty b/scripts/docker/trusty-qt512/ubuntu-esm-infra-trusty new file mode 100644 index 000000000..640bf5fc1 --- /dev/null +++ b/scripts/docker/trusty-qt512/ubuntu-esm-infra-trusty @@ -0,0 +1,4 @@ +# Written by ubuntu-advantage-tools +Package: * +Pin: release o=UbuntuESM, n=trusty +Pin-Priority: never |