Diff of /codesys-ide/Dockerfile [18db23] .. [31733c] Maximize Restore
Switch to unified view
| a/codesys-ide/Dockerfile | b/codesys-ide/Dockerfile | ||
|---|---|---|---|
| 1 | # |
||
| 2 | # Stage 1: |
||
| 3 | # Install CODESYS in debian stretch with wine-development version |
||
| 4 | # |
||
| 1 | FROM debian:stretch |
5 | FROM debian:stretch |
| 2 | 6 | ||
| 3 | RUN dpkg --add-architecture i386 |
7 | RUN dpkg --add-architecture i386 |
| 4 | RUN apt-get update && \ |
8 | RUN apt-get update && \ |
| 5 | apt-get install -y wine32-development wine64-development wget subversion winbind python-requests cabextract xvfb xdotool jwm procps |
9 | apt-get install -y wine32-development wine64-development wget subversion winbind python-requests cabextract xvfb xdotool jwm procps |
... |
... |
||
| 16 | 20 | ||
| 17 | # Install CODESYS |
21 | # Install CODESYS |
| 18 | USER wineuser |
22 | USER wineuser |
| 19 | WORKDIR "/home/wineuser" |
23 | WORKDIR "/home/wineuser" |
| 20 | ADD install.sh /home/wineuser/ |
24 | ADD install.sh /home/wineuser/ |
| 21 | RUN ./install.sh --xvfb |
25 | RUN ./install.sh --xvfb; test -f /home/wineuser/.wine.cds/drive_c/CODESYS/CODESYS/Common/CODESYS.exe |
| 22 | 26 | ||
| 23 | ENV WINEPREFIX=/home/wineuser/.wine.cds |
27 | USER root |
| 28 | RUN apt-get install -y tigervnc-standalone-server |
||
| 29 | |||
| 30 | # |
||
| 31 | # Stage 2 |
||
| 32 | # Copy CODESYS installation into debian testing, as stretch has |
||
| 33 | # a bug in xinetd. The limits for nofile can't be configured. |
||
| 34 | # |
||
| 35 | FROM debian:testing |
||
| 36 | ENV WINEPREFIX=/home/wineuser/.wine.cds |
||
| 37 | |||
| 38 | # Setup VNC with xinetd |
||
| 39 | EXPOSE 8050 |
||
| 40 | USER root |
||
| 41 | RUN dpkg --add-architecture i386 |
||
| 42 | RUN apt-get update && \ |
||
| 43 | apt-get install -y wine32-development wine64-development wget subversion winbind python-requests cabextract xvfb xdotool jwm procps |
||
| 44 | RUN apt-get install -y tigervnc-standalone-server xinetd ratpoison |
||
| 45 | |||
| 46 | # Configure locales |
||
| 47 | RUN useradd -ms /bin/bash wineuser |
||
| 48 | RUN apt-get install -y locales |
||
| 49 | RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ |
||
| 50 | locale-gen |
||
| 51 | ENV LANG en_US.UTF-8 |
||
| 52 | ENV LANGUAGE en_US:en |
||
| 53 | ENV LC_ALL en_US.UTF-8 |
||
| 54 | |||
| 55 | ADD Xvnc /etc/xinetd.d/Xvnc |
||
| 56 | ADD xinetd-vnc /xinetd-vnc |
||
| 57 | |||
| 58 | USER wineuser |
||
| 59 | COPY --from=0 /home/wineuser/.wine.cds /home/wineuser/.wine.cds |
||
| 60 | USER root |
||
| 61 | RUN chown -R wineuser:users /home/wineuser/.wine.cds |
||
| 62 | |||
| 63 | |||
| 64 | #ENTRYPOINT [ "xinetd", "-dontfork" ] |
||
| 24 | 65 |