Skip to content

Commit

Permalink
Dockerfile: update to Qt5.11.2 and Ubuntu 16.04
Browse files Browse the repository at this point in the history
Some features like context menu pasting in were only not present in
Qt5.8.

This means support for 14.04 is dropped.
  • Loading branch information
benma committed Nov 23, 2018
1 parent 96eb8aa commit 14e1e87
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM shiftcrypto/qt5
FROM shiftcrypto/qt5:16.04

ADD scripts/docker_install.sh /tmp/
RUN /tmp/docker_install.sh
Expand Down
10 changes: 5 additions & 5 deletions frontends/qt/docker-qt5base/Dockerfile
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ubuntu:14.04 as qt5base
FROM ubuntu:16.04 as qt5base

ENV DEBIAN_FRONTEND noninteractive

Expand Down Expand Up @@ -81,9 +81,9 @@ RUN apt-get -y install --no-install-recommends \

# Get the source code
RUN cd /tmp && \
wget https://download.qt.io/archive/qt/5.8/5.8.0/single/qt-everywhere-opensource-src-5.8.0.tar.gz && \
tar -xf qt-everywhere-opensource-src-5.8.0.tar.gz && \
mv qt-everywhere-opensource-src-5.8.0 qt5
wget https://download.qt.io/archive/qt/5.11/5.11.2/single/qt-everywhere-src-5.11.2.tar.xz && \
tar -xf qt-everywhere-src-5.11.2.tar.xz && \
mv qt-everywhere-src-5.11.2 qt5

RUN cd /tmp/qt5 && \
./configure \
Expand All @@ -104,7 +104,7 @@ RUN cd /tmp/qt5 && make -j1

RUN cd /tmp/qt5 && make install

FROM ubuntu:14.04
FROM ubuntu:16.04

COPY --from=qt5base /opt/qt5 /opt/qt5

Expand Down

0 comments on commit 14e1e87

Please sign in to comment.