--- a/codesys-ide/Dockerfile +++ b/codesys-ide/Dockerfile @@ -29,37 +29,31 @@ # # Stage 2 -# Copy CODESYS installation into debian testing, as stretch has -# a bug in xinetd. The limits for nofile can't be configured. +# Cleaner image, just containing CODESYS in wine # -FROM debian:testing +FROM debian:stretch ENV WINEPREFIX=/home/wineuser/.wine.cds -# Setup VNC with xinetd -EXPOSE 8050 USER root 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 -RUN apt-get install -y tigervnc-standalone-server xinetd ratpoison + apt-get install -y wine32-development wine64-development wget subversion winbind python-requests \ + locales xvfb # Configure locales RUN useradd -ms /bin/bash wineuser -RUN apt-get install -y locales RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ locale-gen ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 -ADD Xvnc /etc/xinetd.d/Xvnc -ADD xinetd-vnc /xinetd-vnc - USER wineuser COPY --from=0 /home/wineuser/.wine.cds /home/wineuser/.wine.cds USER root RUN chown -R wineuser:users /home/wineuser/.wine.cds +ADD codesys /usr/local/bin/codesys +ADD scripts /usr/local/share/codesys - -ENTRYPOINT [ "xinetd", "-dontfork" ] - +USER wineuser +CMD [ "echo" ]