diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-11-27 15:59:48 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-11-28 11:12:59 -0800 |
| commit | 7d77db96e30fc238aee9f229e583429a6883bf34 (patch) | |
| tree | ca5f5028d600900e9b0806464bdf6f90bc543e7d /scripts | |
| parent | 467cae065141e412c4a8e36dadc8b009fe6aee96 (diff) | |
| download | subsurface-7d77db96e30fc238aee9f229e583429a6883bf34.tar.gz | |
GitHub Actions: work around bug in Ubuntu 14.04 docker base image
Right now in the Ubuntu 14.04 base image for Docker the file
/etc/apt/preferences.d/ubuntu-esm-infra-trusty doesn't exist.
Subsequently, apt-get update enables ESM, but since we don't have a license to
use that upgrades / installs from ESM fail.
This workaround simply ensure that there is such a file pinning ESM to never be
used. With that, the creation of our image should succeed again.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts')
| -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 |