Diff of /codesys-ide/Dockerfile [57fbeb] .. [377479]  Maximize  Restore

Switch to side-by-side view

--- a/codesys-ide/Dockerfile
+++ b/codesys-ide/Dockerfile
@@ -6,7 +6,7 @@
 
 RUN dpkg --add-architecture i386
 RUN apt-get update && \
-    apt-get install -y wine32-development wine64-development wget subversion winbind python-requests cabextract xvfb xdotool jwm procps
+    apt-get install -y wine32-development wine64-development wget subversion winbind python-requests cabextract msitools xvfb xdotool jwm procps
 
 RUN useradd -ms /bin/bash wineuser
 
@@ -21,8 +21,8 @@
 # Install CODESYS
 USER wineuser
 WORKDIR "/home/wineuser"
-ADD install.sh /home/wineuser/
-RUN ./install.sh --xvfb; test -f /home/wineuser/.wine.cds/drive_c/CODESYS/CODESYS/Common/CODESYS.exe
+ADD install2.sh /home/wineuser/
+RUN ./install2.sh; test -f /home/wineuser/.wine.cds/drive_c/CODESYS/CODESYS/Common/CODESYS.exe
 
 USER root
 RUN apt-get install -y tigervnc-standalone-server
@@ -57,11 +57,4 @@
 
 USER wineuser
 
-# test code
-#ADD Test.library /tmp/Test.library
-#RUN cd /tmp && \
-#	codesys compile-library && \
-#	ls /tmp && \
-#	ls /tmp/Test.compiled-library
-
 CMD [ "echo" ]