From b6b1cd01acdc6f583479e51588159f5565802396 Mon Sep 17 00:00:00 2001 From: m1k1o Date: Thu, 1 Apr 2021 21:00:48 +0200 Subject: [PATCH] changed ARM builds. --- .m1k1o/{base_arm => arm-base}/Dockerfile | 0 .m1k1o/base_arm/dbus | 11 - .m1k1o/base_arm/default.pa | 7 - .m1k1o/base_arm/supervisord.conf | 53 -- .m1k1o/base_arm/xorg.conf | 88 --- .m1k1o/build | 47 +- .m1k1o/chromium_arm/Dockerfile | 15 - .m1k1o/chromium_arm/openbox.xml | 763 ----------------------- .m1k1o/chromium_arm/supervisord.conf | 21 - 9 files changed, 30 insertions(+), 975 deletions(-) rename .m1k1o/{base_arm => arm-base}/Dockerfile (100%) delete mode 100755 .m1k1o/base_arm/dbus delete mode 100644 .m1k1o/base_arm/default.pa delete mode 100644 .m1k1o/base_arm/supervisord.conf delete mode 100644 .m1k1o/base_arm/xorg.conf delete mode 100644 .m1k1o/chromium_arm/Dockerfile delete mode 100644 .m1k1o/chromium_arm/openbox.xml delete mode 100644 .m1k1o/chromium_arm/supervisord.conf diff --git a/.m1k1o/base_arm/Dockerfile b/.m1k1o/arm-base/Dockerfile similarity index 100% rename from .m1k1o/base_arm/Dockerfile rename to .m1k1o/arm-base/Dockerfile diff --git a/.m1k1o/base_arm/dbus b/.m1k1o/base_arm/dbus deleted file mode 100755 index bf0d4375..00000000 --- a/.m1k1o/base_arm/dbus +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -if [ ! -d /var/run/dbus ]; then - mkdir -p /var/run/dbus -fi - -if [ -f /var/run/dbus/pid ]; then - rm -f /var/run/dbus/pid -fi - -/usr/bin/dbus-daemon --nofork --print-pid --config-file=/usr/share/dbus-1/system.conf diff --git a/.m1k1o/base_arm/default.pa b/.m1k1o/base_arm/default.pa deleted file mode 100644 index b0a26b10..00000000 --- a/.m1k1o/base_arm/default.pa +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/pulseaudio -nF - -# Allow pulse audio to be accessed via TCP (from localhost only), to allow other users to access the virtual devices -load-module module-native-protocol-unix socket=/tmp/pulseaudio.socket auth-anonymous=1 - -### Make sure we always have a sink around, even if it is a null sink. -load-module module-always-sink diff --git a/.m1k1o/base_arm/supervisord.conf b/.m1k1o/base_arm/supervisord.conf deleted file mode 100644 index 3df95644..00000000 --- a/.m1k1o/base_arm/supervisord.conf +++ /dev/null @@ -1,53 +0,0 @@ -[supervisord] -nodaemon=true -pidfile=/var/run/supervisord.pid -logfile=/dev/null -logfile_maxbytes=0 -loglevel=debug - -[include] -files=/etc/neko/supervisord/*.conf - -[program:dbus] -environment=HOME="/root",USER="root" -command=/usr/bin/dbus -autorestart=true -priority=100 -user=root -stdout_logfile=/var/log/neko/dbus.log -stdout_logfile_maxbytes=100MB -stdout_logfile_backups=10 -redirect_stderr=true - -[program:x-server] -environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s" -command=/usr/bin/X -config /etc/neko/xorg.conf %(ENV_DISPLAY)s -autorestart=true -priority=300 -user=%(ENV_USER)s -stdout_logfile=/var/log/neko/xorg.log -stdout_logfile_maxbytes=100MB -stdout_logfile_backups=10 -redirect_stderr=true - -[program:pulseaudio] -environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" -command=/usr/bin/pulseaudio --disallow-module-loading -vvvv --disallow-exit --exit-idle-time=-1 -autorestart=true -priority=300 -user=%(ENV_USER)s -stdout_logfile=/var/log/neko/pulseaudio.log -stdout_logfile_maxbytes=100MB -stdout_logfile_backups=10 -redirect_stderr=true - -[program:neko] -environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" -command=/usr/bin/neko serve --static "/var/www" -autorestart=true -priority=800 -user=%(ENV_USER)s -stdout_logfile=/var/log/neko/neko.log -stdout_logfile_maxbytes=100MB -stdout_logfile_backups=10 -redirect_stderr=true diff --git a/.m1k1o/base_arm/xorg.conf b/.m1k1o/base_arm/xorg.conf deleted file mode 100644 index 57016ad1..00000000 --- a/.m1k1o/base_arm/xorg.conf +++ /dev/null @@ -1,88 +0,0 @@ -# This xorg configuration file is meant to be used by xpra -# to start a dummy X11 server. -# For details, please see: -# https://xpra.org/trac/wiki/Xdummy - -Section "ServerFlags" - Option "DontVTSwitch" "true" - Option "AllowMouseOpenFail" "true" - Option "PciForceNone" "true" - Option "AutoEnableDevices" "false" - Option "AutoAddDevices" "false" -EndSection - -Section "InputDevice" - Identifier "dummy_mouse" - Option "CorePointer" "true" - Driver "void" -EndSection - -Section "InputDevice" - Identifier "dummy_keyboard" - Option "CoreKeyboard" "true" - Driver "void" -EndSection - -Section "Device" - Identifier "dummy_videocard" - Driver "dummy" - Option "ConstantDPI" "true" - #VideoRam 4096000 - #VideoRam 256000 - VideoRam 192000 -EndSection - -Section "Monitor" - Identifier "dummy_monitor" - HorizSync 5.0 - 1000.0 - VertRefresh 5.0 - 200.0 - #This can be used to get a specific DPI, but only for the default resolution: - #DisplaySize 508 317 - #NOTE: the highest modes will not work without increasing the VideoRam - # for the dummy video card. - # https://arachnoid.com/modelines/ - - # 1280x720 @ 30.00 Hz (GTF) hsync: 21.99 kHz; pclk: 33.78 MHz - Modeline "1280x720_30.00" 33.78 1280 1288 1408 1536 720 721 724 733 -HSync +Vsync - - # 1280x720 @ 60.00 Hz (GTF) hsync: 44.76 kHz; pclk: 74.48 MHz - Modeline "1280x720_60.00" 74.48 1280 1336 1472 1664 720 721 724 746 -HSync +Vsync - # 1152x648 @ 60.00 Hz (GTF) hsync: 40.26 kHz; pclk: 59.91 MHz - Modeline "1152x648_60.00" 59.91 1152 1200 1320 1488 648 649 652 671 -HSync +Vsync - # 1024x576 @ 60.00 Hz (GTF) hsync: 35.82 kHz; pclk: 47.00 MHz - Modeline "1024x576_60.00" 47.00 1024 1064 1168 1312 576 577 580 597 -HSync +Vsync - # 960x720 @ 60.00 Hz (GTF) hsync: 44.76 kHz; pclk: 55.86 MHz - Modeline "960x720_60.00" 55.86 960 1008 1104 1248 720 721 724 746 -HSync +Vsync - # 800x600 @ 60.00 Hz (GTF) hsync: 37.32 kHz; pclk: 38.22 MHz - Modeline "800x600_60.00" 38.22 800 832 912 1024 600 601 604 622 -HSync +Vsync - - # 1920x1080 @ 30.00 Hz (GTF) hsync: 32.97 kHz; pclk: 80.18 MHz - Modeline "1920x1080_30.00" 80.18 1920 1984 2176 2432 1080 1081 1084 1099 -HSync +Vsync - # 1152x648 @ 30.00 Hz (GTF) hsync: 19.80 kHz; pclk: 26.93 MHz - Modeline "1152x648_30.00" 26.93 1152 1144 1256 1360 648 649 652 660 -HSync +Vsync - # 1024x576 @ 30.00 Hz (GTF) hsync: 17.61 kHz; pclk: 20.85 MHz - Modeline "1024x576_30.00" 20.85 1024 1008 1104 1184 576 577 580 587 -HSync +Vsync - # 960x720 @ 30.00 Hz (GTF) hsync: 21.99 kHz; pclk: 25.33 MHz - Modeline "960x720_30.00" 25.33 960 960 1056 1152 720 721 724 733 -HSync +Vsync - # 800x600 @ 30.00 Hz (GTF) hsync: 18.33 kHz; pclk: 17.01 MHz - Modeline "800x600_30.00" 17.01 800 792 864 928 600 601 604 611 -HSync +Vsync -EndSection - -Section "Screen" - Identifier "dummy_screen" - Device "dummy_videocard" - Monitor "dummy_monitor" - DefaultDepth 24 - SubSection "Display" - Viewport 0 0 - Depth 24 - Modes "1280x720_30.00" "1920x1080_60.00" "1280x720_60.00" "1152x648_60.00" "1024x576_60.00" "960x720_60.00" "800x600_60.00" "1920x1080_30.00" "1152x648_30.00" "1024x576_30.00" "960x720_30.00" "800x600_30.00" - EndSubSection -EndSection - -Section "ServerLayout" - Identifier "dummy_layout" - Screen "dummy_screen" - InputDevice "dummy_mouse" - InputDevice "dummy_keyboard" -EndSection diff --git a/.m1k1o/build b/.m1k1o/build index 89ed410b..1a5f6fa0 100755 --- a/.m1k1o/build +++ b/.m1k1o/build @@ -20,28 +20,41 @@ build_server() { neko-dev-server sh -c "rm -rf /tmp/bin/neko; cp /src/bin/neko /tmp/bin" } -build_base() { - docker build -t "${IMAGE}:base" -f base/Dockerfile "${BASE}" -} - -build_base_arm() { - docker build -t "${IMAGE}:base_arm" -f base_arm/Dockerfile "${BASE}" -} - -build_chromium_arm() { - docker build -t "${IMAGE}:chromium_arm" -f chromium_arm/Dockerfile chromium_arm -} - build() { - docker build -t "${IMAGE}:$1" -f "$1/Dockerfile" "$1/" + IMAGE="${IMAGE}:$1" + echo "Building $IMAGE" + + if [ "$1" = "base" ] + then + # build base + docker build -t "${IMAGE}" -f base/Dockerfile "${BASE}" + else + # buld image + docker build -t "${IMAGE}" -f "$1/Dockerfile" "$1/" + fi +} + +build_arm() { + IMAGE="${IMAGE}:arm-$1" + echo "Building (arm) $IMAGE" + + if [ "$1" = "base" ] + then + # build ARM base + docker build -t "${IMAGE}" -f arm-base/Dockerfile "${BASE}" + else + # buld ARM image + docker build -t "${IMAGE}" --build-arg="BASE_IMAGE=${IMAGE}:arm-base" -f "$1/Dockerfile" "$1/" + fi } case $1 in client) build_client;; server) build_server;; - base) build_base;; - base_arm) build_base_arm;; - chromium_arm) build_chromium_arm;; + + # build arm- images + arm-*) build_arm "${1#arm-}";; + + # build images *) build "$1";; esac - diff --git a/.m1k1o/chromium_arm/Dockerfile b/.m1k1o/chromium_arm/Dockerfile deleted file mode 100644 index 46115213..00000000 --- a/.m1k1o/chromium_arm/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM m1k1o/neko:base_arm - -# -# install firefox-esr -RUN set -eux; apt-get update; \ - apt-get install -y --no-install-recommends openbox chromium-browser; \ - # - # clean up - apt-get clean -y; \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* - -# -# copy configuation files -COPY supervisord.conf /etc/neko/supervisord/firefox.conf -COPY openbox.xml /etc/neko/openbox.xml diff --git a/.m1k1o/chromium_arm/openbox.xml b/.m1k1o/chromium_arm/openbox.xml deleted file mode 100644 index 0e73a076..00000000 --- a/.m1k1o/chromium_arm/openbox.xml +++ /dev/null @@ -1,763 +0,0 @@ - - - - - - - - 10 - 20 - - - - - - no - true - yes - normal - - - - - yes - - no - - yes - - no - - 200 - - no - - - - - Smart - -
yes
- - Primary - - 1 - - - - - Clearlooks - NLIMC - - yes - yes - - sans - 8 - - bold - - normal - - - - sans - 8 - - bold - - normal - - - - sans - 9 - - normal - - normal - - - - sans - 9 - - normal - - normal - - - - sans - 9 - - bold - - normal - - - - sans - 9 - - bold - - normal - - - - - - - 1 - 1 - - - - 875 - - - - - yes - Nonpixel - - Center - - - - - 10 - - 10 - - - - - - - 0 - 0 - 0 - 0 - - - - TopLeft - - 0 - 0 - no - Above - - Vertical - - no - 300 - - 300 - - Middle - - - - - C-g - - - - leftno - - - rightno - - - upno - - - downno - - - leftno - - - rightno - - - upno - - - downno - - - 1 - - - 2 - - - 3 - - - 4 - - - - - - - - - - - - - - - - - - - - scrot -s - - - - - - - - - - - - - - - - - - - - - - - - yesyes - - - - - - - - - - - - right - - - - - left - - - - - up - - - - - down - - - - - - - - true - Konqueror - - kfmclient openProfile filemanagement - - - - - scrot - - - - - 1 - - 500 - - 400 - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - previous - - - next - - - previous - - - next - - - previous - - - next - - - - - - - - - - - - - - no - - - - - - - - - - - yes - - - - - - - - - - - - - - - - - - - - - - - - - - - top - - - - - - left - - - - - - right - - - - - - bottom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - vertical - - - horizontal - - - - - - - - - - - - - - - - - previous - - - next - - - - previous - - - next - - - previous - - - next - - - - - - - - - - - - - - - - - - - - previous - - - next - - - previous - - - next - - - - - - - - - - - menu.xml - 200 - - no - - 100 - - 400 - - yes - - yes - - - - - - - - diff --git a/.m1k1o/chromium_arm/supervisord.conf b/.m1k1o/chromium_arm/supervisord.conf deleted file mode 100644 index 0ba73bc1..00000000 --- a/.m1k1o/chromium_arm/supervisord.conf +++ /dev/null @@ -1,21 +0,0 @@ -[program:firefox-esr] -environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" -command=/usr/bin/chromium-browser --window-position=0,0 --display=%(ENV_DISPLAY)s --start-maximized --bwsi --test-type --force-dark-mode --disable-file-system --disable-software-rasterizer -autorestart=true -priority=800 -user=%(ENV_USER)s -stdout_logfile=/var/log/neko/chromium-arm.log -stdout_logfile_maxbytes=100MB -stdout_logfile_backups=10 -redirect_stderr=true - -[program:openbox] -environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" -command=/usr/bin/openbox --config-file /etc/neko/openbox.xml -autorestart=true -priority=300 -user=%(ENV_USER)s -stdout_logfile=/var/log/neko/openbox.log -stdout_logfile_maxbytes=100MB -stdout_logfile_backups=10 -redirect_stderr=true