Desktop: Upgrade to precompiled Qt 5.12.9 with OpenSSL 1.1.1g #231
Conversation
| @@ -2,6 +2,15 @@ FROM ubuntu:xenial | |||
|
|
|||
| MAINTAINER Roeland Jago Douma <roeland@famdouma.nl> | |||
|
|
|||
| # Run 'docker build' with '--build-arg BUILD_QT=1' to build Qt from source (default: not set) | |||
There was a problem hiding this comment.
I'm not asking to change this in that PR, I'm just trying to solve what's still a mystery to me. :-)
Why are we not building it in the image always? Why are we building it once and downloading this separately? I'd expect that build to be a one time pain anyway, it's not the case?
There was a problem hiding this comment.
See here:
https://github.com/nextcloud/docker-ci/blob/f7700ce/client/Dockerfile-5.12#L115-L122
;-)
Docker Hub has a forced timeout for jobs, they usually terminate after around 240 minutes. So I had to come up with a solution to get us an image anyway ;)
There was a problem hiding this comment.
Ah annoying indeed... And what about making our own base image that we upload? or Docker hub forces us to let it build itself?
There was a problem hiding this comment.
Yepp ;/
Might be possible to do it this way, that just would take more time to tinker with again ;)
- Upgrade to precompiled Qt 5.12.9
- Also implement env vars for specifying the Qt and OpenSSL versions, to get rid
of some duplication as they are used very often.
- Add command line argument to enable building Qt from source with having to modify
the Dockerfile:
Run 'docker build' with '--build-arg BUILD_QT=1' to build Qt from source (default: not set)
on a dedicated build machine:
docker build -t client-5.12 . --build-arg BUILD_QT=1
Then for example run the following command to get the Qt tarball:
docker run \
--name build-qt-tmp \
--rm \
-v $(pwd):/output \
client-5.12 \
/bin/bash -c 'cp /qt-bin* /output/'
Puts the tarball into the current working directory.
Signed-off-by: Michael Schuster <michael@schuster.ms>
Signed-off-by: Michael Schuster <michael@schuster.ms>
See: nextcloud/desktop#2213 Signed-off-by: Michael Schuster <michael@schuster.ms>
misch7
force-pushed
the
client_qt-5.12.9-precompiled
branch
from
8a343ec
to
d052154
Compare
Also remove the jq package installation from the AppImage build script because the package is included in the new Docker image (see nextcloud/docker-ci#231). Signed-off-by: Michael Schuster <michael@schuster.ms>
| @@ -150,3 +150,5 @@ RUN if [ "$BUILD_QT" != "1" ] ; then echo Download precompiled Qt. && \ | |||
| tar -xvf ${QT_TARBALL} && \ | |||
| rm ${QT_TARBALL} \ | |||
| ; fi | |||
|
|
|||
There was a problem hiding this comment.
I guess you didn't want to keep that line and the next? (they appear alone in the jq commit)
There was a problem hiding this comment.
Intended, wanted to have a clear separator for whatever will come after the Qt-related stuff ;)
Also remove the jq package installation from the AppImage build script because the package is included in the new Docker image (see nextcloud/docker-ci#231). Signed-off-by: Michael Schuster <michael@schuster.ms>
Upgrade to precompiled Qt 5.12.9
Also implement
envvars for specifying the Qt and OpenSSL versions, to get rid of some duplication as they are used very often.Add command line argument to enable building Qt from source with having to modify the
Dockerfile:Run
docker buildwith--build-arg BUILD_QT=1to build Qt from source (default: not set) on a dedicated build machine:docker build -t client-5.12 . --build-arg BUILD_QT=1Then for example run the following command to get the Qt tarball:
Puts the tarball into the current working directory.
Other tweaks:
make -j$(nproc)to use all available CPU coresjqpackage for the new CI bot (See: Drone: Upload AppImage to GitHub using nextcloud-desktop-bot desktop#2213)