Diff of /codesys-ide/Dockerfile [9fd219] .. [e4b57d]  Maximize  Restore

Switch to unified view

a/codesys-ide/Dockerfile b/codesys-ide/Dockerfile
...
...
22
USER wineuser
22
USER wineuser
23
WORKDIR "/home/wineuser"
23
WORKDIR "/home/wineuser"
24
ADD install2.sh /home/wineuser/
24
ADD install2.sh /home/wineuser/
25
RUN ./install2.sh; test -f /home/wineuser/.wine.cds/drive_c/CODESYS/CODESYS/Common/CODESYS.exe
25
RUN ./install2.sh; test -f /home/wineuser/.wine.cds/drive_c/CODESYS/CODESYS/Common/CODESYS.exe
26
26
27
USER root
27
ADD codesys /usr/local/bin/codesys
28
RUN apt-get install -y tigervnc-standalone-server
28
ADD scripts /usr/local/share/codesys
29
29
30
#
30
USER wineuser
31
# Stage 2
31
32
# Cleaner image, just containing CODESYS in wine
32
#RUN codesys install https://forge.codesys.com/svn/prj,cfunit,code/tags/v1.0.0.0/CfUnit.package
33
#
33
ADD SimpleCfUnitExample.project /
34
FROM debian:stretch
34
RUN ls -1 /usr/bin/wine*-development
35
ENV WINEPREFIX=/home/wineuser/.wine.cds
35
RUN codesys save-projectarchive
36
37
USER root
38
RUN dpkg --add-architecture i386
39
RUN apt-get update && \
40
    apt-get install -y wine32-development wine64-development wget subversion winbind python-requests psmisc \
41
    locales xvfb
42
    
43
# Configure locales
44
RUN useradd -ms /bin/bash wineuser
45
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
46
    locale-gen
47
ENV LANG en_US.UTF-8  
48
ENV LANGUAGE en_US:en  
49
ENV LC_ALL en_US.UTF-8
50
51
USER wineuser
52
COPY --from=0 /home/wineuser/.wine.cds /home/wineuser/.wine.cds
53
USER root
54
RUN chown -R wineuser:users /home/wineuser/.wine.cds
55
ADD codesys /usr/local/bin/codesys
56
ADD scripts /usr/local/share/codesys
57
58
USER wineuser
59
36
60
CMD [ "echo" ]
37
CMD [ "echo" ]