Browse Source

Release 1

Vadim Surkov 5 years ago
parent
commit
d5cbdb0b16
3 changed files with 10 additions and 5 deletions
  1. 1 0
      .dockerignore
  2. 7 4
      Dockerfile
  3. 2 1
      entrypoint.sh

+ 1 - 0
.dockerignore

@@ -1,3 +1,4 @@
 .git
 .svn
+.subversion
 */.svn

+ 7 - 4
Dockerfile

@@ -1,7 +1,7 @@
 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 \
+    && svn co  --force svn://192.168.21.250/programs/trunk/App/Bin/Win32/Lib Lib --username public --password "sds#7753435" \
+    && svn co  --force 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" \
@@ -10,11 +10,14 @@ RUN set -x \
     && 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"
+    && svn up SyncManager.exe --username public --password "sds#7753435" \
+    && rm -rf /repository/Lib/.svn \
+    && rm -rf /repository/syncmanager/.svn
 
 
-FROM registry.sdsys.ru/wine:centos6-0.1.1
+FROM registry.sdsys.ru/wine:fedora30-1
 
+ENV WINEPREFIX=/root/wine32 WINEARCH=win32
 RUN mkdir -p /opt/syncmanager
 COPY --from=svn /repository/syncmanager /opt/syncmanager
 COPY --from=svn /repository/Lib /opt/syncmanager

+ 2 - 1
entrypoint.sh

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