update to QT 5.12.4

This commit is contained in:
Justin Hammond 2019-06-18 01:50:28 +08:00
parent d30ad470dd
commit 160a7e7703
3 changed files with 6 additions and 6 deletions

View file

@ -45,7 +45,7 @@ RUN chmod u+rx,g+rx,o+rx,a-w /opt/docker-entrypoint.sh && \
# RUN # RUN
# #
EXPOSE 2990 EXPOSE 2990
USER worker #USER worker
ENV MAVEN_REPOSITORY_MIRROR "false" ENV MAVEN_REPOSITORY_MIRROR "false"
ENV JAVA_HOME /opt/jdk ENV JAVA_HOME /opt/jdk
ENV PATH ${PATH}:/opt/atlassian-plugin-sdk-${ATLS_VERSIN}/bin/:/opt/jdk/bin/ ENV PATH ${PATH}:/opt/atlassian-plugin-sdk-${ATLS_VERSIN}/bin/:/opt/jdk/bin/

View file

@ -6,11 +6,11 @@ WORKDIR /opt
RUN dnf update -y && \ RUN dnf update -y && \
dnf groupinstall 'Development Tools' -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 && \ 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 && \ 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.3.tar.xz && \ tar -xJf qt-everywhere-src-5.12.4.tar.xz && \
mkdir qt-build && \ mkdir qt-build && \
cd 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 && \ cd /opt/qt-build && \
make -j28 && \ make -j28 && \
make install 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 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 WORKDIR /opt
COPY --from=builder /opt/Qt /opt/Qt 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

View file

@ -1 +1 @@
docker build . -t fishwaldo/qt-staticbuilds:5.12.3 docker build . -t fishwaldo/qt-staticbuilds:5.12.4