update server dockerfiles.

This commit is contained in:
Miroslav Šedivý
2024-09-08 11:52:15 +02:00
parent 0c1d7ef229
commit b617c5cc32
4 changed files with 44 additions and 8 deletions
+11 -2
View File
@@ -116,7 +116,12 @@ RUN set -eux; \
chown $USERNAME /tmp/.X11-unix/; \
#
# make directories for neko
mkdir -p /etc/neko /var/www; \
mkdir -p /etc/neko /var/www /var/log/neko \
/tmp/runtime-$USERNAME \
/home/$USERNAME/.config/pulse \
/home/$USERNAME/.local/share/xorg; \
chmod 1777 /var/log/neko; \
chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \
chown -R $USERNAME:$USERNAME /home/$USERNAME; \
#
# install fonts
@@ -125,10 +130,13 @@ RUN set -eux; \
fonts-noto-color-emoji \
# Chinese fonts
fonts-arphic-ukai fonts-arphic-uming \
fonts-wqy-zenhei xfonts-intl-chinese xfonts-wqy \
# Japanese fonts
fonts-ipafont-mincho fonts-ipafont-gothic \
fonts-takao-mincho \
# Korean fonts
fonts-unfonts-core \
fonts-wqy-microhei \
# Indian fonts
fonts-indic; \
#
@@ -160,6 +168,7 @@ COPY runtime/fonts /usr/local/share/fonts
ENV USER=$USERNAME
ENV DISPLAY=:99.0
ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket
ENV XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME
ENV NEKO_SERVER_BIND=:8080
ENV NEKO_PLUGINS_ENABLED=true
ENV NEKO_PLUGINS_DIR=/etc/neko/plugins/
@@ -179,4 +188,4 @@ HEALTHCHECK --interval=10s --timeout=5s --retries=8 \
#
# run neko
CMD ["/usr/bin/supervisord", "-s", "-c", "/etc/neko/supervisord.conf"]
CMD ["/usr/bin/supervisord", "-c", "/etc/neko/supervisord.conf"]
+11 -2
View File
@@ -108,7 +108,12 @@ RUN set -eux; \
chown $USERNAME /tmp/.X11-unix/; \
#
# make directories for neko
mkdir -p /etc/neko /var/www; \
mkdir -p /etc/neko /var/www /var/log/neko \
/tmp/runtime-$USERNAME \
/home/$USERNAME/.config/pulse \
/home/$USERNAME/.local/share/xorg; \
chmod 1777 /var/log/neko; \
chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \
chown -R $USERNAME:$USERNAME /home/$USERNAME; \
#
# install fonts
@@ -117,10 +122,13 @@ RUN set -eux; \
fonts-noto-color-emoji \
# Chinese fonts
fonts-arphic-ukai fonts-arphic-uming \
fonts-wqy-zenhei xfonts-intl-chinese xfonts-wqy \
# Japanese fonts
fonts-ipafont-mincho fonts-ipafont-gothic \
fonts-takao-mincho \
# Korean fonts
fonts-unfonts-core \
fonts-wqy-microhei \
# Indian fonts
fonts-indic; \
#
@@ -150,6 +158,7 @@ COPY runtime/fonts /usr/local/share/fonts
ENV USER=$USERNAME
ENV DISPLAY=:99.0
ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket
ENV XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME
ENV NEKO_SERVER_BIND=:8080
ENV NEKO_PLUGINS_ENABLED=true
ENV NEKO_PLUGINS_DIR=/etc/neko/plugins/
@@ -169,4 +178,4 @@ HEALTHCHECK --interval=10s --timeout=5s --retries=8 \
#
# run neko
CMD ["/usr/bin/supervisord", "-s", "-c", "/etc/neko/supervisord.conf"]
CMD ["/usr/bin/supervisord", "-c", "/etc/neko/supervisord.conf"]
+11 -2
View File
@@ -219,7 +219,12 @@ RUN set -eux; \
chown $USERNAME /tmp/.X11-unix/; \
#
# make directories for neko
mkdir -p /etc/neko /var/www; \
mkdir -p /etc/neko /var/www /var/log/neko \
/tmp/runtime-$USERNAME \
/home/$USERNAME/.config/pulse \
/home/$USERNAME/.local/share/xorg; \
chmod 1777 /var/log/neko; \
chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \
chown -R $USERNAME:$USERNAME /home/$USERNAME; \
#
# install fonts
@@ -228,10 +233,13 @@ RUN set -eux; \
fonts-noto-color-emoji \
# Chinese fonts
fonts-arphic-ukai fonts-arphic-uming \
fonts-wqy-zenhei xfonts-intl-chinese xfonts-wqy \
# Japanese fonts
fonts-ipafont-mincho fonts-ipafont-gothic \
fonts-takao-mincho \
# Korean fonts
fonts-unfonts-core \
fonts-wqy-microhei \
# Indian fonts
fonts-indic; \
#
@@ -303,6 +311,7 @@ COPY runtime/fonts /usr/local/share/fonts
ENV USER=$USERNAME
ENV DISPLAY=:99.0
ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket
ENV XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME
ENV NEKO_SERVER_BIND=:8080
ENV NEKO_PLUGINS_ENABLED=true
ENV NEKO_PLUGINS_DIR=/etc/neko/plugins/
@@ -332,4 +341,4 @@ HEALTHCHECK --interval=10s --timeout=5s --retries=8 \
#
# run neko
CMD ["/usr/bin/supervisord", "-s", "-c", "/etc/neko/supervisord.conf"]
CMD ["/usr/bin/supervisord", "-c", "/etc/neko/supervisord.conf"]
+11 -2
View File
@@ -211,7 +211,12 @@ RUN set -eux; \
chown $USERNAME /tmp/.X11-unix/; \
#
# make directories for neko
mkdir -p /etc/neko /var/www; \
mkdir -p /etc/neko /var/www /var/log/neko \
/tmp/runtime-$USERNAME \
/home/$USERNAME/.config/pulse \
/home/$USERNAME/.local/share/xorg; \
chmod 1777 /var/log/neko; \
chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \
chown -R $USERNAME:$USERNAME /home/$USERNAME; \
#
# install fonts
@@ -220,10 +225,13 @@ RUN set -eux; \
fonts-noto-color-emoji \
# Chinese fonts
fonts-arphic-ukai fonts-arphic-uming \
fonts-wqy-zenhei xfonts-intl-chinese xfonts-wqy \
# Japanese fonts
fonts-ipafont-mincho fonts-ipafont-gothic \
fonts-takao-mincho \
# Korean fonts
fonts-unfonts-core \
fonts-wqy-microhei \
# Indian fonts
fonts-indic; \
#
@@ -293,6 +301,7 @@ COPY runtime/fonts /usr/local/share/fonts
ENV USER=$USERNAME
ENV DISPLAY=:99.0
ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket
ENV XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME
ENV NEKO_SERVER_BIND=:8080
ENV NEKO_PLUGINS_ENABLED=true
ENV NEKO_PLUGINS_DIR=/etc/neko/plugins/
@@ -322,4 +331,4 @@ HEALTHCHECK --interval=10s --timeout=5s --retries=8 \
#
# run neko
CMD ["/usr/bin/supervisord", "-s", "-c", "/etc/neko/supervisord.conf"]
CMD ["/usr/bin/supervisord", "-c", "/etc/neko/supervisord.conf"]