mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

GitHub Actions: work around bug in Ubuntu 14.04 docker base image

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2019-11-27 15:59:48 -08:00
parent 467cae0651
commit 7d77db96e3
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/docker/trusty-qt512/Dockerfile
View file

@ -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
RUN rm -rf subsurface libgit2 googlemaps grantlee

4
scripts/docker/trusty-qt512/ubuntu-esm-infra-trusty Normal file
View file

@ -0,0 +1,4 @@
# Written by ubuntu-advantage-tools
Package: *
Pin: release o=UbuntuESM, n=trusty
Pin-Priority: never