Vadim Surkov 5 years ago
parent
commit
2864617dfe
4 changed files with 7 additions and 4 deletions
  1. 3 0
      .dockerignore
  2. 1 0
      .gitignore
  3. 1 1
      Dockerfile
  4. 2 3
      build.sh

+ 3 - 0
.dockerignore

@@ -0,0 +1,3 @@
+.git
+.svn
+*/.svn

+ 1 - 0
.gitignore

@@ -0,0 +1 @@
+analis/*

+ 1 - 1
Dockerfile

@@ -1,6 +1,6 @@
 FROM registry.sdsys.ru/report:1.1
 
 RUN mkdir -p /root/.wine/drive_c/services/analis
-COPY repository /root/.wine/drive_c/services/analis/
+COPY analis /root/.wine/drive_c/services/analis/
 
 ENTRYPOINT ["/usr/bin/xvfb-run","-a","wine","/root/.wine/drive_c/services/analis/AnalisServer.exe"]

+ 2 - 3
build.sh

@@ -1,4 +1,3 @@
 docker run -it --rm -v $(pwd):/repository registry.sdsys.ru/alpine-svn:0.3 cleanup analis
-docker run -it --rm -v $(pwd):/repository registry.sdsys.ru/alpine-svn:0.3 checkout --force --no-auth-cache svn://192.168.21.250/programs/trunk/Services/Analis/Win32 analis --username public --password "sds#7753435"
-mv ./analis/.svn ./svn
-#docker build -t analis-wineservice .
+docker run -it --rm -v $(pwd):/repository registry.sdsys.ru/alpine-svn:0.3 co --force --no-auth-cache svn://192.168.21.250/programs/trunk/Services/Analis/Win32 analis --username public --password "sds#7753435"
+docker build -t analis-wineservice .