Dockerfile: 修改dockerfile满足分布编译需求

walking98 · Apr 1, 2020 · d93fc92 · d93fc92
1 parent f755a7a
commit d93fc92
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 26 deletions.
diff --git a/mainwindow.cpp b/mainwindow.cpp
diff --git a/Dockerfile b/Dockerfile
@@ -1,15 +1,16 @@
-FROM tefworkshop/qt5-gui
-
+FROM linakesi/qt5-builder as builder
 MAINTAINER cetc15 
-
 #RUN apt-get update && apt-get install -y apt-utils sudo
 USER root
-
 COPY .  /home/HelloWorldGui
-RUN tar xvf /home/HelloWorldGui/lib.tar -C /usr
 WORKDIR /home/HelloWorldGui
+RUN tar xvf /home/HelloWorldGui/lib.tar -C /usr
 RUN qmake HelloWorldGui.pro; make
-RUN chmod +x /home/HelloWorldGui/HelloWorldGui; ls /home/HelloWorldGui/
+RUN chmod +x /home/HelloWorldGui/HelloWorldGui
 
-CMD /home/HelloWorldGui/HelloWorldGui
+FROM linakesi/qt5-release
+COPY lib.tar  /home/HelloWorldGui/lib.tar
+RUN tar xvf /home/HelloWorldGui/lib.tar -C /usr
+COPY --from=builder /home/HelloWorldGui/HelloWorldGui /usr/bin/HelloWorldGui
+CMD ["HelloWorldGui"]
 
diff --git a/git-cmd.sh b/git-cmd.sh