mirror of
https://github.com/m1k1o/neko.git
synced 2024-07-24 14:40:50 +12:00
alpine
This commit is contained in:
Craig
parent
06feef7559
commit
0e9fbf7ba2
@ -1,69 +1,48 @@
|
||||
FROM golang:stretch
|
||||
FROM nurdism/neko
|
||||
|
||||
# This Dockerfile adds a non-root user with sudo access. Use the "remoteUser"
|
||||
# property in devcontainer.json to use it. On Linux, the container user's GID/UIDs
|
||||
# will be updated to match your local UID/GID (when using the dockerFile property).
|
||||
# See https://aka.ms/vscode-remote/containers/non-root-user for details.
|
||||
ARG USERNAME=vscode
|
||||
ARG USERNAME=neko
|
||||
ARG USER_UID=1000
|
||||
ARG USER_GID=$USER_UID
|
||||
|
||||
# Avoid warnings by switching to noninteractive
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
# Set to false to skip installing zsh and Oh My ZSH!
|
||||
ARG INSTALL_ZSH="true"
|
||||
|
||||
# Runtime for testing and compileing
|
||||
RUN apt-get update \
|
||||
&& apt-get -y install supervisor openbox dbus-x11 ttf-freefont xvfb pulseaudio consolekit firefox-esr x11vnc \
|
||||
&& apt-get -y install libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-good gstreamer1.0-pulseaudio \
|
||||
&& apt-get -y install gcc libc6-dev \
|
||||
&& apt-get -y install libx11-dev xorg-dev libxtst-dev libpng++-dev \
|
||||
&& apt-get -y install xcb libxcb-xkb-dev x11-xkb-utils libx11-xcb-dev libxkbcommon-x11-dev \
|
||||
&& apt-get -y install libxkbcommon-dev \
|
||||
&& apt-get -y install xsel xclip
|
||||
# Location and expected SHA for common setup script - SHA generated on release
|
||||
ARG COMMON_SCRIPT_SOURCE="https://raw.githubusercontent.com/microsoft/vscode-dev-containers/master/script-library/common-alpine.sh"
|
||||
ARG COMMON_SCRIPT_SHA="dev-mode"
|
||||
|
||||
# Configure apt, install packages and tools
|
||||
RUN apt-get update \
|
||||
&& apt-get -y install --no-install-recommends apt-utils apt-transport-https dialog 2>&1 \
|
||||
# Install git, bash, dependencies, and add a non-root user
|
||||
RUN apk update \
|
||||
&& apk add --no-cache wget coreutils ca-certificates \
|
||||
&& apk add --no-cache wget openssl docker libxtst-dev xclip x11vnc glib-dev gobject-introspection \
|
||||
#
|
||||
# Verify git, process tools, lsb-release (common in install instructions for CLIs) installed
|
||||
&& apt-get -y install git iproute2 procps lsb-release xz-utils \
|
||||
#
|
||||
# Install Docker CE CLI
|
||||
&& apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common lsb-release \
|
||||
&& curl -fsSL https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/gpg | (OUT=$(apt-key add - 2>&1) || echo $OUT) \
|
||||
&& add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y docker-ce-cli \
|
||||
#
|
||||
# Install Docker Compose
|
||||
&& curl -sSL "https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
|
||||
&& chmod +x /usr/local/bin/docker-compose \
|
||||
#
|
||||
# Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user.
|
||||
&& groupadd --gid $USER_GID $USERNAME \
|
||||
&& useradd --uid $USER_UID --gid $USERNAME --shell /bin/bash --create-home $USERNAME \
|
||||
&& adduser $USERNAME audio \
|
||||
&& adduser $USERNAME video \
|
||||
&& adduser $USERNAME pulse \
|
||||
# Add sudo support for the non-root user
|
||||
&& apt-get install -y sudo \
|
||||
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
|
||||
&& chmod 0440 /etc/sudoers.d/$USERNAME
|
||||
# Verify git, common tools / libs installed, add/modify non-root user, optionally install zsh
|
||||
&& wget -q -O /tmp/common-setup.sh $COMMON_SCRIPT_SOURCE \
|
||||
&& if [ "$COMMON_SCRIPT_SHA" != "dev-mode" ]; then echo "$COMMON_SCRIPT_SHA /tmp/common-setup.sh" | sha256sum -c - ; fi \
|
||||
&& /bin/ash /tmp/common-setup.sh "$INSTALL_ZSH" "$USERNAME" "$USER_UID" "$USER_GID" \
|
||||
&& rm /tmp/common-setup.sh
|
||||
|
||||
ENV NODE_VERSION 12.14.1
|
||||
|
||||
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
|
||||
&& case "${dpkgArch##*-}" in \
|
||||
amd64) ARCH='x64';; \
|
||||
ppc64el) ARCH='ppc64le';; \
|
||||
s390x) ARCH='s390x';; \
|
||||
arm64) ARCH='arm64';; \
|
||||
armhf) ARCH='armv7l';; \
|
||||
i386) ARCH='x86';; \
|
||||
*) echo "unsupported architecture"; exit 1 ;; \
|
||||
ENV NODE_VERSION 13.7.0
|
||||
RUN apk add --no-cache curl libstdc++ \
|
||||
&& ARCH= && alpineArch="$(apk --print-arch)" \
|
||||
&& case "${alpineArch##*-}" in \
|
||||
x86_64) \
|
||||
ARCH='x64' \
|
||||
CHECKSUM="4c153345a08d2eeb40dfbb62f1ef6ade7ec369630f9cf9f061bf9d52b10acafc" \
|
||||
;; \
|
||||
*) ;; \
|
||||
esac \
|
||||
&& if [ -n "${CHECKSUM}" ]; then \
|
||||
set -eu; \
|
||||
curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \
|
||||
echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \
|
||||
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
|
||||
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs; \
|
||||
else \
|
||||
echo "Building from source" \
|
||||
# backup build
|
||||
&& apk add --no-cache binutils-gold g++ gcc gnupg libgcc linux-headers make python \
|
||||
# gpg keys listed at https://github.com/nodejs/node#release-keys
|
||||
&& set -ex \
|
||||
&& for key in \
|
||||
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
|
||||
FD3A5288F042B6850C66B31F09FE44734EB7990E \
|
||||
@ -81,49 +60,98 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
|
||||
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
|
||||
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
|
||||
done \
|
||||
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
|
||||
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
|
||||
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
|
||||
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
|
||||
&& grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
|
||||
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
|
||||
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
|
||||
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs
|
||||
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
|
||||
&& tar -xf "node-v$NODE_VERSION.tar.xz" \
|
||||
&& cd "node-v$NODE_VERSION" \
|
||||
&& ./configure \
|
||||
&& make -j$(getconf _NPROCESSORS_ONLN) V= \
|
||||
&& make install \
|
||||
&& cd .. \
|
||||
&& rm -Rf "node-v$NODE_VERSION" \
|
||||
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \
|
||||
fi \
|
||||
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"
|
||||
|
||||
USER $USERNAME
|
||||
ENV GOLANG_VERSION 1.13.6
|
||||
RUN set -eux \
|
||||
&& apk add --no-cache bash gcc musl-dev openssl go \
|
||||
&& export \
|
||||
# set GOROOT_BOOTSTRAP such that we can actually build Go
|
||||
GOROOT_BOOTSTRAP="$(go env GOROOT)" \
|
||||
# ... and set "cross-building" related vars to the installed system's values so that we create a build targeting the proper arch
|
||||
# (for example, if our build host is GOARCH=amd64, but our build env/image is GOARCH=386, our build needs GOARCH=386)
|
||||
GOOS="$(go env GOOS)" \
|
||||
GOARCH="$(go env GOARCH)" \
|
||||
GOHOSTOS="$(go env GOHOSTOS)" \
|
||||
GOHOSTARCH="$(go env GOHOSTARCH)" \
|
||||
; \
|
||||
# also explicitly set GO386 and GOARM if appropriate
|
||||
# https://github.com/docker-library/golang/issues/184
|
||||
apkArch="$(apk --print-arch)"; \
|
||||
case "$apkArch" in \
|
||||
armhf) export GOARM='6' ;; \
|
||||
armv7) export GOARM='7' ;; \
|
||||
x86) export GO386='387' ;; \
|
||||
esac; \
|
||||
wget -O go.tgz "https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz"; \
|
||||
echo 'aae5be954bdc40bcf8006eb77e8d8a5dde412722bc8effcdaf9772620d06420c *go.tgz' | sha256sum -c -; \
|
||||
tar -C /usr/local -xzf go.tgz; \
|
||||
rm go.tgz; \
|
||||
cd /usr/local/go/src; \
|
||||
./make.bash; \
|
||||
rm -rf \
|
||||
# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125
|
||||
/usr/local/go/pkg/bootstrap \
|
||||
# https://golang.org/cl/82095
|
||||
# https://github.com/golang/build/blob/e3fe1605c30f6a3fd136b561569933312ede8782/cmd/release/releaselet.go#L56
|
||||
/usr/local/go/pkg/obj \
|
||||
&& export PATH="/usr/local/go/bin:$PATH" \
|
||||
&& go version
|
||||
|
||||
# Install packages and tools
|
||||
RUN go get -x -d github.com/stamblerre/gocode 2>&1 \
|
||||
ENV GOPATH /go
|
||||
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
|
||||
|
||||
#
|
||||
# Install Go tools w/module support
|
||||
RUN mkdir -p /tmp/gotools \
|
||||
&& cd /tmp/gotools \
|
||||
&& GO111MODULE=on go get -v golang.org/x/tools/gopls@latest 2>&1 \
|
||||
&& GO111MODULE=on go get -v \
|
||||
honnef.co/go/tools/...@latest \
|
||||
golang.org/x/tools/cmd/gorename@latest \
|
||||
golang.org/x/tools/cmd/goimports@latest \
|
||||
golang.org/x/tools/cmd/guru@latest \
|
||||
golang.org/x/lint/golint@latest \
|
||||
github.com/mdempsky/gocode@latest \
|
||||
github.com/cweill/gotests/...@latest \
|
||||
github.com/haya14busa/goplay/cmd/goplay@latest \
|
||||
github.com/sqs/goreturns@latest \
|
||||
github.com/josharian/impl@latest \
|
||||
github.com/davidrjenni/reftools/cmd/fillstruct@latest \
|
||||
github.com/uudashr/gopkgs/cmd/gopkgs@latest \
|
||||
github.com/ramya-rao-a/go-outline@latest \
|
||||
github.com/acroca/go-symbols@latest \
|
||||
github.com/godoctor/godoctor@latest \
|
||||
github.com/rogpeppe/godef@latest \
|
||||
github.com/zmb3/gogetdoc@latest \
|
||||
github.com/fatih/gomodifytags@latest \
|
||||
github.com/mgechev/revive@latest \
|
||||
github.com/go-delve/delve/cmd/dlv@latest 2>&1 \
|
||||
#
|
||||
# Install Go tools w/o module support
|
||||
&& go get -v github.com/alecthomas/gometalinter 2>&1 \
|
||||
#
|
||||
# Install gocode-gomod
|
||||
&& go get -x -d github.com/stamblerre/gocode 2>&1 \
|
||||
&& go build -o gocode-gomod github.com/stamblerre/gocode \
|
||||
&& mv gocode-gomod $GOPATH/bin/ \
|
||||
#
|
||||
# Install Go tools
|
||||
&& go get -u -v \
|
||||
github.com/mdempsky/gocode \
|
||||
github.com/uudashr/gopkgs/cmd/gopkgs \
|
||||
github.com/ramya-rao-a/go-outline \
|
||||
github.com/acroca/go-symbols \
|
||||
github.com/godoctor/godoctor \
|
||||
golang.org/x/tools/cmd/guru \
|
||||
golang.org/x/tools/cmd/gorename \
|
||||
github.com/rogpeppe/godef \
|
||||
github.com/zmb3/gogetdoc \
|
||||
github.com/haya14busa/goplay/cmd/goplay \
|
||||
github.com/sqs/goreturns \
|
||||
github.com/josharian/impl \
|
||||
github.com/davidrjenni/reftools/cmd/fillstruct \
|
||||
github.com/fatih/gomodifytags \
|
||||
github.com/cweill/gotests/... \
|
||||
golang.org/x/tools/cmd/goimports \
|
||||
golang.org/x/lint/golint \
|
||||
golang.org/x/tools/gopls \
|
||||
github.com/alecthomas/gometalinter \
|
||||
honnef.co/go/tools/... \
|
||||
github.com/golangci/golangci-lint/cmd/golangci-lint \
|
||||
github.com/mgechev/revive \
|
||||
github.com/derekparker/delve/cmd/dlv 2>&1
|
||||
# Install golangci-lint
|
||||
&& curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin 2>&1
|
||||
|
||||
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" "$GOPATH/pkg/mod" && chmod -R 777 "$GOPATH"
|
||||
|
||||
ENV GO111MODULE=on
|
||||
|
||||
# Switch back to dialog for any ad-hoc use of apt-get
|
||||
ENV DEBIAN_FRONTEND=dialog
|
||||
|
||||
|
||||
@ -3,9 +3,9 @@
|
||||
"service": "neko",
|
||||
"dockerComposeFile": "docker-compose.yaml",
|
||||
"workspaceFolder": "/workspace",
|
||||
"remoteUser": "vscode",
|
||||
"remoteUser": "neko",
|
||||
"settings": {
|
||||
"terminal.integrated.shell.linux": "/bin/bash",
|
||||
"terminal.integrated.shell.linux": "/bin/ash",
|
||||
"go.gopath": "/go"
|
||||
},
|
||||
"extensions": [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
version: '3.6'
|
||||
version: '2.0'
|
||||
services:
|
||||
neko:
|
||||
network_mode: host
|
||||
@ -11,6 +11,7 @@ services:
|
||||
security_opt:
|
||||
- seccomp:unconfined
|
||||
volumes:
|
||||
- /home/neko/src:/workspace
|
||||
- /home/nurd/neko:/workspace
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
|
||||
command: "/bin/sh -c \"while sleep 1000; do :; done\""
|
||||
@ -1,6 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
sudo /etc/init.d/dbus start
|
||||
|
||||
echo "Starting supervisord"
|
||||
/usr/bin/supervisord -c /etc/neko/supervisord.conf
|
||||
4
.docker/files/dbus
Executable file
4
.docker/files/dbus
Executable file
@ -0,0 +1,4 @@
|
||||
#!/bin/sh
|
||||
|
||||
rm -rf /var/run/dbus.pid
|
||||
/usr/bin/dbus-daemon --nofork --print-pid --config-file=/usr/share/dbus-1/system.conf
|
||||
@ -28,7 +28,7 @@
|
||||
},
|
||||
{
|
||||
"Title": "9Anime",
|
||||
"URL": "https://9anime.to/",
|
||||
"URL": "https://9anime.xyz/",
|
||||
"Favicon": "https://staticf.akacdn.ru/assets/favicons/favicon.png",
|
||||
"Folder": "Media",
|
||||
"Placement": "toolbar"
|
||||
@ -640,7 +640,7 @@
|
||||
|
||||
<!-- default menu file (or custom one in $HOME/.config/openbox/) -->
|
||||
<!-- system menu files on Debian systems -->
|
||||
<file>/var/lib/openbox/debian-menu.xml</file>
|
||||
<!--file>/var/lib/openbox/debian-menu.xml</file-->
|
||||
<file>menu.xml</file>
|
||||
<hideDelay>200</hideDelay>
|
||||
<!-- if a press-release lasts longer than this setting (in milliseconds), the
|
||||
49
.docker/files/supervisord.conf
Normal file
49
.docker/files/supervisord.conf
Normal file
@ -0,0 +1,49 @@
|
||||
[supervisord]
|
||||
nodaemon=true
|
||||
logfile=/dev/null
|
||||
logfile_maxbytes=0
|
||||
loglevel=debug
|
||||
|
||||
[program:dbus]
|
||||
environment=HOME="/root",USER="root"
|
||||
command=/usr/bin/dbus
|
||||
redirect_stderr=true
|
||||
autorestart=true
|
||||
priority=100
|
||||
user=root
|
||||
|
||||
[program:xvfb]
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
|
||||
command=/usr/bin/Xvfb %(ENV_DISPLAY)s -screen 0 %(ENV_SCREEN_WIDTH)sx%(ENV_SCREEN_HEIGHT)sx%(ENV_SCREEN_DEPTH)s
|
||||
redirect_stderr=true
|
||||
autorestart=true
|
||||
priority=300
|
||||
user=%(ENV_USER)s
|
||||
|
||||
[program:pulseaudio]
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
|
||||
command=/usr/bin/pulseaudio --disallow-module-loading -vvvv --disallow-exit --exit-idle-time=-1
|
||||
autorestart=true
|
||||
priority=300
|
||||
user=%(ENV_USER)s
|
||||
|
||||
[program:openbox]
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
|
||||
command=/usr/bin/openbox --config-file /etc/neko/openbox.xml
|
||||
autorestart=true
|
||||
priority=300
|
||||
user=%(ENV_USER)s
|
||||
|
||||
[program:firefox-esr]
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
|
||||
command=/usr/lib/firefox/firefox --display=%(ENV_DISPLAY)s --setDefaultBrowser -width %(ENV_SCREEN_WIDTH)s -height %(ENV_SCREEN_HEIGHT)s
|
||||
autorestart=true
|
||||
priority=400
|
||||
user=%(ENV_USER)s
|
||||
|
||||
[program:neko]
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
|
||||
command=/usr/bin/neko serve -d --static "/var/www"
|
||||
autorestart=true
|
||||
priority=800
|
||||
user=%(ENV_USER)s
|
||||
@ -1,31 +1,42 @@
|
||||
[supervisord]
|
||||
environment=PULSE_SERVER="unix:/tmp/pulseaudio.socket",DISPLAY=":%(ENV_NEKO_DISPLAY)s"
|
||||
nodaemon=true
|
||||
logfile=/dev/null
|
||||
logfile_maxbytes=0
|
||||
#logfile=/dev/null
|
||||
#logfile_maxbytes=0
|
||||
loglevel=debug
|
||||
|
||||
[program:dbus]
|
||||
environment=HOME="/root",USER="root"
|
||||
command=/usr/bin/dbus
|
||||
redirect_stderr=true
|
||||
autorestart=true
|
||||
priority=100
|
||||
user=root
|
||||
|
||||
[program:xvfb]
|
||||
command=/usr/bin/Xvfb :%(ENV_NEKO_DISPLAY)s -screen 0 %(ENV_NEKO_WIDTH)sx%(ENV_NEKO_HEIGHT)sx24+32
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
|
||||
command=/usr/bin/Xvfb %(ENV_DISPLAY)s -screen 0 %(ENV_SCREEN_WIDTH)sx%(ENV_SCREEN_HEIGHT)sx%(ENV_SCREEN_DEPTH)s
|
||||
redirect_stderr=true
|
||||
autorestart=true
|
||||
priority=300
|
||||
user=%(ENV_USER)s
|
||||
|
||||
[program:pulseaudio]
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
|
||||
command=/usr/bin/pulseaudio --disallow-module-loading -vvvv --disallow-exit --exit-idle-time=-1
|
||||
autorestart=true
|
||||
priority=300
|
||||
user=%(ENV_USER)s
|
||||
|
||||
[program:openbox]
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
|
||||
command=/usr/bin/openbox --config-file /etc/neko/openbox.xml
|
||||
autorestart=true
|
||||
priority=300
|
||||
user=%(ENV_USER)s
|
||||
|
||||
[program:firefox-esr]
|
||||
command=/usr/lib/firefox-esr/firefox-esr --kiosk --display=:%(ENV_NEKO_DISPLAY)s --setDefaultBrowser -width %(ENV_NEKO_WIDTH)s -height %(ENV_NEKO_HEIGHT)s %(ENV_NEKO_URL)s
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
|
||||
command=/usr/lib/firefox/firefox --display=%(ENV_DISPLAY)s --setDefaultBrowser -width %(ENV_SCREEN_WIDTH)s -height %(ENV_SCREEN_HEIGHT)s
|
||||
autorestart=true
|
||||
priority=400
|
||||
|
||||
[program:neko]
|
||||
command=/usr/bin/neko serve -d --static "/var/www"
|
||||
autorestart=true
|
||||
priority=800
|
||||
user=%(ENV_USER)s
|
||||
@ -1,27 +0,0 @@
|
||||
[supervisord]
|
||||
environment=PULSE_SERVER="unix:/tmp/pulseaudio.socket",DISPLAY=":%(ENV_NEKO_DISPLAY)s"
|
||||
nodaemon=true
|
||||
#logfile=/dev/null
|
||||
#logfile_maxbytes=0
|
||||
loglevel=debug
|
||||
|
||||
[program:xvfb]
|
||||
command=/usr/bin/Xvfb :%(ENV_NEKO_DISPLAY)s -screen 0 %(ENV_NEKO_WIDTH)sx%(ENV_NEKO_HEIGHT)sx24+32
|
||||
redirect_stderr=true
|
||||
autorestart=true
|
||||
priority=300
|
||||
|
||||
[program:pulseaudio]
|
||||
command=/usr/bin/pulseaudio --disallow-module-loading -vvvv --disallow-exit --exit-idle-time=-1
|
||||
autorestart=true
|
||||
priority=300
|
||||
|
||||
[program:openbox]
|
||||
command=/usr/bin/openbox --config-file /etc/neko/openbox.xml
|
||||
autorestart=true
|
||||
priority=300
|
||||
|
||||
[program:firefox-esr]
|
||||
command=/usr/lib/firefox-esr/firefox-esr --display=:%(ENV_NEKO_DISPLAY)s --setDefaultBrowser -width %(ENV_NEKO_WIDTH)s -height %(ENV_NEKO_HEIGHT)s %(ENV_NEKO_URL)s
|
||||
autorestart=true
|
||||
priority=400
|
||||
36
.docker/test
36
.docker/test
@ -13,20 +13,20 @@
|
||||
# fi
|
||||
|
||||
sudo mkdir -p /var/run/dbus /etc/neko
|
||||
sudo /etc/init.d/dbus start
|
||||
sudo rm -rf /var/run/dbus.pid
|
||||
|
||||
sudo cp default.pa /etc/pulse/default.pa
|
||||
sudo cp files/firefox/neko.js /usr/lib/firefox/mozilla.cfg
|
||||
sudo cp files/firefox/autoconfig.js /usr/lib/firefox/defaults/pref/autoconfig.js
|
||||
sudo cp files/firefox/policies.json /usr/lib/firefox/distribution/policies.json
|
||||
|
||||
sudo cp firefox/neko.js /usr/lib/firefox-esr/mozilla.cfg
|
||||
sudo cp firefox/autoconfig.js /usr/lib/firefox-esr/defaults/pref/autoconfig.js
|
||||
sudo cp firefox/policies.json /usr/lib/firefox-esr/distribution/policies.json
|
||||
sudo cp files/dbus /usr/bin/dbus
|
||||
sudo cp files/default.pa /etc/pulse/default.pa
|
||||
sudo cp files/supervisord.conf /etc/neko/supervisord.conf
|
||||
sudo cp files/openbox.xml /etc/neko/openbox.xml
|
||||
|
||||
sudo cp supervisord.conf /etc/neko/supervisord.conf
|
||||
sudo cp openbox.xml /etc/neko/openbox.xml
|
||||
|
||||
if [ ! -f /usr/lib/firefox-esr/distribution/extensions/uBlock0@raymondhill.net.xpi ]; then
|
||||
sudo mkdir -p /usr/lib/firefox-esr/distribution/extensions
|
||||
sudo curl -o /usr/lib/firefox-esr/distribution/extensions/uBlock0@raymondhill.net.xpi https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/addon-607454-latest.xpi
|
||||
if [ ! -f /usr/lib/firefox/distribution/extensions/uBlock0@raymondhill.net.xpi ]; then
|
||||
sudo mkdir -p /usr/lib/firefox/distribution/extensions
|
||||
sudo curl -o /usr/lib/firefox/distribution/extensions/uBlock0@raymondhill.net.xpi https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/addon-607454-latest.xpi
|
||||
fi
|
||||
|
||||
sudo cp ../server/bin/neko /usr/bin/neko
|
||||
@ -38,13 +38,15 @@ sudo rm -rf /var/run/supervisord.pid
|
||||
mkdir -p $HOME/.config/pulse
|
||||
echo "default-server=unix:/tmp/pulseaudio.socket" > $HOME/.config/pulse/client.conf
|
||||
|
||||
export NEKO_DISPLAY=0
|
||||
export NEKO_WIDTH=1280
|
||||
export NEKO_HEIGHT=720
|
||||
export NEKO_URL=https://www.youtube.com/embed/QH2-TGUlwu4
|
||||
export USER=vscode
|
||||
export SCREEN_WIDTH=1280
|
||||
export SCREEN_HEIGHT=720
|
||||
export SCREEN_DEPTH=24
|
||||
export DISPLAY=:99.0
|
||||
|
||||
export NEKO_PASSWORD=neko
|
||||
export NEKO_BIND=0.0.0.0:80
|
||||
export NEKO_BIND=:8080
|
||||
export NEKO_KEY=
|
||||
export NEKO_CERT=
|
||||
|
||||
supervisord --configuration ./supervisord.dev.conf
|
||||
supervisord --configuration ./supervisord.conf
|
||||
141
Dockerfile
141
Dockerfile
@ -1,83 +1,120 @@
|
||||
FROM debian:stretch-slim
|
||||
FROM frolvlad/alpine-glibc
|
||||
|
||||
ENV GST_VERSION=1.16.2
|
||||
|
||||
# build gstreamer
|
||||
RUN apk add --no-cache --virtual .gst-build-deps \
|
||||
build-base bison flex perl python glib-dev zlib-dev \
|
||||
opus-dev \
|
||||
pulseaudio-dev libx11-dev libxv-dev libxt-dev libxfixes-dev libvpx-dev \
|
||||
git nasm openssl-dev \
|
||||
#
|
||||
# build gstreamer
|
||||
&& cd /tmp \
|
||||
&& wget "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$GST_VERSION.tar.xz" \
|
||||
&& tar xvfJ "gstreamer-$GST_VERSION.tar.xz" > /dev/null \
|
||||
&& cd "gstreamer-$GST_VERSION" \
|
||||
&& ./configure --prefix=/usr \
|
||||
&& make && make install \
|
||||
&& cd /tmp && rm -rf "gstreamer-$GST_VERSION" \
|
||||
#
|
||||
# build gst-plugins-base
|
||||
&& wget "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$GST_VERSION.tar.xz" \
|
||||
&& tar xvfJ "gst-plugins-base-$GST_VERSION.tar.xz" > /dev/null \
|
||||
&& cd "gst-plugins-base-$GST_VERSION" \
|
||||
&& ./configure --prefix=/usr \
|
||||
&& make && make install \
|
||||
&& cd /tmp && rm -rf "gst-plugins-base-$GST_VERSION" \
|
||||
#
|
||||
# build gst-plugins-good
|
||||
&& wget "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$GST_VERSION.tar.xz" \
|
||||
&& tar xvfJ "gst-plugins-good-$GST_VERSION.tar.xz" > /dev/null \
|
||||
&& cd "gst-plugins-good-$GST_VERSION" \
|
||||
&& ./configure --prefix=/usr \
|
||||
&& make && make install \
|
||||
&& cd /tmp && rm -rf "gst-plugins-good-$GST_VERSION" \
|
||||
#
|
||||
# build openh264
|
||||
&& git clone https://github.com/cisco/openh264.git \
|
||||
&& cd openh264 \
|
||||
&& make && make install \
|
||||
&& cd /tmp && rm -rf openh264 \
|
||||
#
|
||||
# build gst-plugins-bad
|
||||
&& wget "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-$GST_VERSION.tar.xz" \
|
||||
&& tar xvfJ "gst-plugins-bad-$GST_VERSION.tar.xz" > /dev/null \
|
||||
&& cd "gst-plugins-bad-$GST_VERSION" \
|
||||
&& ./configure --prefix=/usr \
|
||||
&& make && make install \
|
||||
&& cd /tmp && rm -rf "gst-plugins-bad-$GST_VERSION" \
|
||||
#
|
||||
# remove build deps
|
||||
&& apk del .gst-build-deps
|
||||
|
||||
ARG USERNAME=neko
|
||||
ARG USER_UID=1000
|
||||
ARG USER_GID=$USER_UID
|
||||
|
||||
# Avoid warnings by switching to noninteractive
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
# RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories
|
||||
# RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories
|
||||
# RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
|
||||
|
||||
# Install dependencies ttf-freefont
|
||||
RUN apt-get update \
|
||||
&& apt-get -y install curl apt-utils supervisor openbox dbus-x11 xvfb pulseaudio firefox-esr \
|
||||
&& apt-get -y install gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-pulseaudio \
|
||||
&& apt-get -y install libxcb-xkb-dev libxkbcommon-x11-dev xclip \
|
||||
# install neko dependencies
|
||||
RUN apk add --no-cache supervisor openbox dbus-x11 xvfb pulseaudio alsa-plugins-pulse opus libvpx libxv libxtst libxfixes xclip ttf-freefont \
|
||||
&& apk add --no-cache libevent --repository "http://dl-cdn.alpinelinux.org/alpine/edge/main" \
|
||||
&& apk add --no-cache firefox-esr --repository "http://dl-cdn.alpinelinux.org/alpine/edge/community" \
|
||||
#
|
||||
# Create a non-root user
|
||||
&& groupadd --gid $USER_GID $USERNAME \
|
||||
&& useradd --uid $USER_UID --gid $USERNAME --shell /bin/bash --create-home $USERNAME \
|
||||
# create a non-root user
|
||||
&& addgroup -g $USER_GID $USERNAME \
|
||||
&& adduser -D -u $USER_UID -G $USERNAME -s /bin/ash -h /home/$USERNAME $USERNAME \
|
||||
&& adduser $USERNAME audio \
|
||||
&& adduser $USERNAME video \
|
||||
&& adduser $USERNAME pulse \
|
||||
#
|
||||
# Add sudo support for the non-root user
|
||||
&& apt-get install -y sudo \
|
||||
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
|
||||
&& chmod 0440 /etc/sudoers.d/$USERNAME \
|
||||
# install uBlock
|
||||
&& mkdir -p /usr/lib/firefox/distribution/extensions \
|
||||
&& wget -O /usr/lib/firefox/distribution/extensions/uBlock0@raymondhill.net.xpi https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/addon-607454-latest.xpi \
|
||||
#
|
||||
# Install uBlock
|
||||
&& mkdir -p /usr/lib/firefox-esr/distribution/extensions \
|
||||
&& curl -o /usr/lib/firefox-esr/distribution/extensions/uBlock0@raymondhill.net.xpi https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/addon-607454-latest.xpi \
|
||||
#
|
||||
# Setup Pulse Audio
|
||||
# setup pulseaudio
|
||||
&& mkdir -p /home/$USERNAME/.config/pulse/ \
|
||||
&& echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf \
|
||||
&& chown -R $USERNAME:$USERNAME /home/$USERNAME \
|
||||
#
|
||||
# Workaround for an X11 problem. See: http://blog.tigerteufel.de/?p=476
|
||||
# workaround for an X11 problem: http://blog.tigerteufel.de/?p=476
|
||||
&& mkdir /tmp/.X11-unix && chmod 1777 /tmp/.X11-unix && chown $USERNAME /tmp/.X11-unix/ \
|
||||
#
|
||||
# Make directories for neko
|
||||
&& mkdir -p /etc/neko /var/www \
|
||||
#
|
||||
# Clean up
|
||||
&& apt-get autoremove -y \
|
||||
&& apt-get clean -y \
|
||||
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
|
||||
# make directories for neko
|
||||
&& mkdir -p /etc/neko /var/www
|
||||
|
||||
#
|
||||
# Copy configuation files
|
||||
COPY .docker/openbox.xml /etc/neko/openbox.xml
|
||||
COPY .docker/supervisord.conf /etc/neko/supervisord.conf
|
||||
COPY .docker/default.pa /etc/pulse/default.pa
|
||||
COPY .docker/firefox/neko.js /usr/lib/firefox-esr/mozilla.cfg
|
||||
COPY .docker/firefox/autoconfig.js /usr/lib/firefox-esr/defaults/pref/autoconfig.js
|
||||
COPY .docker/firefox/policies.json /usr/lib/firefox-esr/distribution/policies.json
|
||||
# env
|
||||
ENV USER=$USERNAME
|
||||
ENV SCREEN_WIDTH=1280
|
||||
ENV SCREEN_HEIGHT=720
|
||||
ENV SCREEN_DEPTH=24
|
||||
ENV DISPLAY=:99.0
|
||||
|
||||
#
|
||||
# Neko files
|
||||
# copy configuation files
|
||||
COPY .docker/files/dbus /usr/bin/dbus
|
||||
COPY .docker/files/openbox.xml /etc/neko/openbox.xml
|
||||
COPY .docker/files/supervisord.conf /etc/neko/supervisord.conf
|
||||
COPY .docker/files/default.pa /etc/pulse/default.pa
|
||||
COPY .docker/files/firefox/neko.js /usr/lib/firefox/mozilla.cfg
|
||||
COPY .docker/files/firefox/autoconfig.js /usr/lib/firefox/defaults/pref/autoconfig.js
|
||||
COPY .docker/files/firefox/policies.json /usr/lib/firefox/distribution/policies.json
|
||||
|
||||
#
|
||||
# neko files
|
||||
COPY client/dist/ /var/www
|
||||
COPY server/bin/neko /usr/bin/neko
|
||||
|
||||
USER $USERNAME
|
||||
|
||||
#
|
||||
# Neko Env
|
||||
ENV NEKO_USER=$USERNAME
|
||||
ENV NEKO_DISPLAY=0
|
||||
ENV NEKO_WIDTH=1280
|
||||
ENV NEKO_HEIGHT=720
|
||||
# neko env
|
||||
ENV NEKO_PASSWORD=neko
|
||||
ENV NEKO_ADMIN=admin
|
||||
ENV NEKO_BIND=:8080
|
||||
|
||||
# Neko Nyan (=^-ω-^=)
|
||||
ENV NEKO_URL=https://www.youtube.com/embed/QH2-TGUlwu4
|
||||
|
||||
#
|
||||
# Copy entrypoint
|
||||
COPY .docker/entrypoint.sh /entrypoint.sh
|
||||
|
||||
#
|
||||
# Run Service
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
||||
# run neko
|
||||
CMD ["/usr/bin/supervisord", "-c", "/etc/neko/supervisord.conf"]
|
||||
@ -1,3 +1 @@
|
||||
DISPLAY=:0
|
||||
PULSE_SERVER=unix:/tmp/pulseaudio.socket
|
||||
GST_PLUGIN_PATH=/usr/lib/x86_64-linux-gnu/gstreamer-1.0/
|
||||
DISPLAY=:99.0
|
||||
|
||||
@ -187,6 +187,7 @@ func (p *Pipeline) Stop() {
|
||||
C.gstreamer_send_stop_pipeline(p.Pipeline)
|
||||
}
|
||||
|
||||
// gst-inspect-1.0
|
||||
func CheckPlugins(plugins []string) error {
|
||||
var plugin *C.GstPlugin
|
||||
for _, pluginstr := range plugins {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user