From 160a7e7703c3a1e1f8dda457a51791073d24798b Mon Sep 17 00:00:00 2001 From: Justin Hammond Date: Tue, 18 Jun 2019 01:50:28 +0800 Subject: [PATCH] update to QT 5.12.4 --- AtlassianSDK/Dockerfile | 2 +- Fedora-QT/Dockerfile | 8 ++++---- Fedora-QT/build.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AtlassianSDK/Dockerfile b/AtlassianSDK/Dockerfile index 16d4b0a..783c798 100644 --- a/AtlassianSDK/Dockerfile +++ b/AtlassianSDK/Dockerfile @@ -45,7 +45,7 @@ RUN chmod u+rx,g+rx,o+rx,a-w /opt/docker-entrypoint.sh && \ # RUN # EXPOSE 2990 -USER worker +#USER worker ENV MAVEN_REPOSITORY_MIRROR "false" ENV JAVA_HOME /opt/jdk ENV PATH ${PATH}:/opt/atlassian-plugin-sdk-${ATLS_VERSIN}/bin/:/opt/jdk/bin/ diff --git a/Fedora-QT/Dockerfile b/Fedora-QT/Dockerfile index 21c0e11..3e8e702 100644 --- a/Fedora-QT/Dockerfile +++ b/Fedora-QT/Dockerfile @@ -6,11 +6,11 @@ WORKDIR /opt RUN dnf update -y && \ dnf groupinstall 'Development Tools' -y && \ dnf install wget mc joe xz which gcc-c++ gperf bison flex openssl-devel mesa-libGL-devel libXrender-devel libxkbcommon-devel libXcomposite-devel libXcursor-devel libXi-devel libinput-devel freetype-devel fontconfig-devel -y && \ - wget http://download.qt.io/official_releases/qt/5.12/5.12.3/single/qt-everywhere-src-5.12.3.tar.xz && \ - tar -xJf qt-everywhere-src-5.12.3.tar.xz && \ + wget http://download.qt.io/official_releases/qt/5.12/5.12.4/single/qt-everywhere-src-5.12.4.tar.xz && \ + tar -xJf qt-everywhere-src-5.12.4.tar.xz && \ mkdir qt-build && \ cd qt-build && \ - ../qt-everywhere-src-5.12.3/configure --prefix=/opt/Qt/5.12.3/ --opensource -confirm-license -release -static -optimize-size -syslog -no-use-gold-linker -nomake examples -nomake tests -openssl-runtime -qt-xcb -qt-zlib -qt-libjpeg -qt-libpng -system-freetype -qt-pcre -qt-harfbuzz -fontconfig && \ + ../qt-everywhere-src-5.12.4/configure --prefix=/opt/Qt/5.12.4/ --opensource -confirm-license -release -static -optimize-size -syslog -no-use-gold-linker -nomake examples -nomake tests -openssl-runtime -qt-xcb -qt-zlib -qt-libjpeg -qt-libpng -system-freetype -qt-pcre -qt-harfbuzz -fontconfig && \ cd /opt/qt-build && \ make -j28 && \ make install @@ -24,6 +24,6 @@ RUN dnf update -y && \ dnf install wget mc joe xz which gcc-c++ gperf bison flex openssl-devel mesa-libGL-devel libXrender-devel libxkbcommon-devel libXcomposite-devel libXcursor-devel libXi-devel libinput-devel freetype-devel fontconfig-devel -y WORKDIR /opt COPY --from=builder /opt/Qt /opt/Qt -RUN echo "PATH=$PATH:/opt/Qt/5.12.3/bin" > /etc/profile.d/qt.sh && echo "export PATH" >> /etc/profile.d/qt.sh +RUN echo "PATH=$PATH:/opt/Qt/5.12.4/bin" > /etc/profile.d/qt.sh && echo "export PATH" >> /etc/profile.d/qt.sh \ No newline at end of file diff --git a/Fedora-QT/build.sh b/Fedora-QT/build.sh index ff65094..5730211 100755 --- a/Fedora-QT/build.sh +++ b/Fedora-QT/build.sh @@ -1 +1 @@ -docker build . -t fishwaldo/qt-staticbuilds:5.12.3 +docker build . -t fishwaldo/qt-staticbuilds:5.12.4