Diff of /codesys-ide/Dockerfile [16685e] .. [220c38] Maximize Restore
Switch to unified view
| a/codesys-ide/Dockerfile | b/codesys-ide/Dockerfile | ||
|---|---|---|---|
... |
... |
||
| 27 | USER root |
27 | USER root |
| 28 | RUN apt-get install -y tigervnc-standalone-server |
28 | RUN apt-get install -y tigervnc-standalone-server |
| 29 | 29 | ||
| 30 | # |
30 | # |
| 31 | # Stage 2 |
31 | # Stage 2 |
| 32 | # Copy CODESYS installation into debian testing, as stretch has |
32 | # Cleaner image, just containing CODESYS in wine |
| 33 | # a bug in xinetd. The limits for nofile can't be configured. |
||
| 34 | # |
33 | # |
| 35 | FROM debian:testing |
34 | FROM debian:stretch |
| 36 | ENV WINEPREFIX=/home/wineuser/.wine.cds |
35 | ENV WINEPREFIX=/home/wineuser/.wine.cds |
| 37 | 36 | ||
| 38 | # Setup VNC with xinetd |
||
| 39 | EXPOSE 8050 |
||
| 40 | USER root |
37 | USER root |
| 41 | RUN dpkg --add-architecture i386 |
38 | RUN dpkg --add-architecture i386 |
| 42 | RUN apt-get update && \ |
39 | RUN apt-get update && \ |
| 43 | apt-get install -y wine32-development wine64-development wget subversion winbind python-requests cabextract xvfb xdotool jwm procps |
40 | apt-get install -y wine32-development wine64-development wget subversion winbind python-requests \ |
| 44 | RUN apt-get install -y tigervnc-standalone-server xinetd ratpoison |
41 | locales xvfb |
| 45 | 42 | ||
| 46 | # Configure locales |
43 | # Configure locales |
| 47 | RUN useradd -ms /bin/bash wineuser |
44 | 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 && \ |
45 | RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ |
| 50 | locale-gen |
46 | locale-gen |
| 51 | ENV LANG en_US.UTF-8 |
47 | ENV LANG en_US.UTF-8 |
| 52 | ENV LANGUAGE en_US:en |
48 | ENV LANGUAGE en_US:en |
| 53 | ENV LC_ALL en_US.UTF-8 |
49 | ENV LC_ALL en_US.UTF-8 |
| 54 | 50 | ||
| 55 | ADD Xvnc /etc/xinetd.d/Xvnc |
||
| 56 | ADD xinetd-vnc /xinetd-vnc |
||
| 57 | |||
| 58 | USER wineuser |
51 | USER wineuser |
| 59 | COPY --from=0 /home/wineuser/.wine.cds /home/wineuser/.wine.cds |
52 | COPY --from=0 /home/wineuser/.wine.cds /home/wineuser/.wine.cds |
| 60 | USER root |
53 | USER root |
| 61 | RUN chown -R wineuser:users /home/wineuser/.wine.cds |
54 | RUN chown -R wineuser:users /home/wineuser/.wine.cds |
| 62 | 55 | ADD codesys /usr/local/bin/codesys |
|
| 63 | 56 | ADD scripts /usr/local/share/codesys |
|
| 64 | ENTRYPOINT [ "xinetd", "-dontfork" ] |
57 | |
| 58 | USER wineuser |
||
| 59 | CMD [ "echo" ] |
||
| 65 | 60 |