Browse Source

unsaved changes

Vadim Surkov 5 years ago
parent
commit
e9124ea7e6
2 changed files with 22 additions and 5 deletions
  1. 20 5
      Dockerfile
  2. 2 0
      entrypoint.sh

+ 20 - 5
Dockerfile

@@ -1,8 +1,23 @@
-FROM registry.sdsys.ru/wine:centos7-1
+FROM registry.sdsys.ru/alpine-svn as svn
+RUN set -x \
+    && svn co  --force --no-auth-cache svn://192.168.21.250/programs/trunk/App/Bin/Win32/Lib Lib --username public --password "sds#7753435" \
+    && svn co  --force --no-auth-cache svn://192.168.21.250/programs/trunk/App/Bin/Win32 syncmanager --username public --password "sds#7753435" --depth empty \
+    && cd syncmanager \
+    && svn up IconsLib.dll --username public --password "sds#7753435" \
+    && svn up ExcelExport.dll --username public --password "sds#7753435" \
+    && svn up ssleay32.dll --username public --password "sds#7753435" \
+    && svn up GDS32.DLL --username public --password "sds#7753435" \
+    && svn up msvcr100.dll --username public --password "sds#7753435" \
+    && svn up 7z.dll --username public --password "sds#7753435" \
+    && svn up libeay32.dll --username public --password "sds#7753435" \
+    && svn up SyncManager.exe --username public --password "sds#7753435"
+
+
+FROM registry.sdsys.ru/wine:centos6-0.1.1
 
 RUN mkdir -p /opt/syncmanager
-COPY syncmanager /opt/syncmanager
-COPY Lib /opt/syncmanager
-COPY healthcheck.sh entrypoint.sh /opt/
+COPY --from=svn /repository/syncmanager /opt/syncmanager
+COPY --from=svn /repository/Lib /opt/syncmanager
+COPY entrypoint.sh /opt/
 
-ENTRYPOINT ["/usr/bin/xvfb-run","-a","wine","/opt/syncmanager/SyncManager.exe"]
+ENTRYPOINT ["/opt/entrypoint.sh"]

+ 2 - 0
entrypoint.sh

@@ -0,0 +1,2 @@
+#/bin/bash
+exec "/usr/bin/xvfb-run" "-a" "wine" "/opt/syncmanager/SyncManager.exe" "$@"