mirror of
https://github.com/linuxserver/docker-baseimage-rdesktop.git
synced 2026-02-20 08:39:58 +08:00
Migrate to s6v3
This commit is contained in:
TheSpad
parent
fa3bd6eee7
commit
689beff96b
@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-arch:3d4daa98-ls73 as buildstage
|
||||
FROM ghcr.io/linuxserver/baseimage-arch:latest as buildstage
|
||||
|
||||
RUN \
|
||||
echo "**** install build deps ****" && \
|
||||
@ -33,7 +33,7 @@ RUN \
|
||||
FROM ghcr.io/linuxserver/docker-compose:amd64-latest as compose
|
||||
|
||||
# runtime stage
|
||||
FROM ghcr.io/linuxserver/baseimage-arch:3d4daa98-ls73
|
||||
FROM ghcr.io/linuxserver/baseimage-arch:latest
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-arch:arm64v8-3d4daa98-ls73 as buildstage
|
||||
FROM ghcr.io/linuxserver/baseimage-arch:arm64v8-latest as buildstage
|
||||
|
||||
RUN \
|
||||
echo "**** install build deps ****" && \
|
||||
@ -33,7 +33,7 @@ RUN \
|
||||
FROM ghcr.io/linuxserver/docker-compose:amd64-latest as compose
|
||||
|
||||
# runtime stage
|
||||
FROM ghcr.io/linuxserver/baseimage-arch:arm64v8-3d4daa98-ls73
|
||||
FROM ghcr.io/linuxserver/baseimage-arch:arm64v8-latest
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-arch:arm32v7-3d4daa98-ls73 as buildstage
|
||||
FROM ghcr.io/linuxserver/baseimage-arch:arm32v7-latest as buildstage
|
||||
|
||||
RUN \
|
||||
echo "**** install build deps ****" && \
|
||||
@ -33,7 +33,7 @@ RUN \
|
||||
FROM ghcr.io/linuxserver/docker-compose:amd64-latest as compose
|
||||
|
||||
# runtime stage
|
||||
FROM ghcr.io/linuxserver/baseimage-arch:arm32v7-3d4daa98-ls73
|
||||
FROM ghcr.io/linuxserver/baseimage-arch:arm32v7-latest
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
|
||||
1
root/etc/s6-overlay/s6-rc.d/init-keygen/type
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-keygen/type
Normal file
@ -0,0 +1 @@
|
||||
oneshot
|
||||
1
root/etc/s6-overlay/s6-rc.d/init-keygen/up
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-keygen/up
Normal file
@ -0,0 +1 @@
|
||||
/etc/s6-overlay/s6-rc.d/init-keygen/run
|
||||
1
root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/type
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/type
Normal file
@ -0,0 +1 @@
|
||||
oneshot
|
||||
1
root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/up
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/up
Normal file
@ -0,0 +1 @@
|
||||
# This file doesn't do anything, it's just the end of the rdesktop base init process
|
||||
16
root/etc/cont-init.d/30-config → root/etc/s6-overlay/s6-rc.d/init-rdesktop/run
Normal file → Executable file
16
root/etc/cont-init.d/30-config → root/etc/s6-overlay/s6-rc.d/init-rdesktop/run
Normal file → Executable file
@ -1,6 +1,6 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
|
||||
if [ ! -e /lock.file ]; then
|
||||
if [[ ! -e /lock.file ]]; then
|
||||
# give abc a sudo shell
|
||||
chsh abc -s /bin/bash
|
||||
sed -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=(ALL:ALL) NOPASSWD: ALL/g' \
|
||||
@ -12,12 +12,14 @@ fi
|
||||
touch /lock.file
|
||||
|
||||
# default file copies first run
|
||||
[[ ! -d /config/.config ]] && \
|
||||
mkdir -p /config/.config && \
|
||||
cp /defaults/bashrc /config/.bashrc && \
|
||||
cp /defaults/startwm.sh /config/startwm.sh
|
||||
if [[ ! -d /config/.config ]]; then
|
||||
mkdir -p /config/.config
|
||||
cp /defaults/bashrc /config/.bashrc
|
||||
cp /defaults/startwm.sh /config/startwm.sh
|
||||
fi
|
||||
|
||||
# permissions
|
||||
PERM=$(stat -c '%U' /config/.config)
|
||||
[[ "${PERM}" != "abc" ]] && \
|
||||
chown -R abc:abc /config
|
||||
if [[ "${PERM}" != "abc" ]]; then
|
||||
chown -R abc:abc /config
|
||||
fi
|
||||
1
root/etc/s6-overlay/s6-rc.d/init-rdesktop/type
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-rdesktop/type
Normal file
@ -0,0 +1 @@
|
||||
oneshot
|
||||
1
root/etc/s6-overlay/s6-rc.d/init-rdesktop/up
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-rdesktop/up
Normal file
@ -0,0 +1 @@
|
||||
/etc/s6-overlay/s6-rc.d/init-rdesktop/run
|
||||
0
root/etc/cont-init.d/50-gid-video → root/etc/s6-overlay/s6-rc.d/init-video/run
Normal file → Executable file
0
root/etc/cont-init.d/50-gid-video → root/etc/s6-overlay/s6-rc.d/init-video/run
Normal file → Executable file
1
root/etc/s6-overlay/s6-rc.d/init-video/type
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-video/type
Normal file
@ -0,0 +1 @@
|
||||
oneshot
|
||||
1
root/etc/s6-overlay/s6-rc.d/init-video/up
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-video/up
Normal file
@ -0,0 +1 @@
|
||||
/etc/s6-overlay/s6-rc.d/init-video/run
|
||||
@ -0,0 +1 @@
|
||||
4
|
||||
@ -4,6 +4,6 @@
|
||||
fdmove -c 2 1
|
||||
|
||||
# Notify service manager when xrdp is up
|
||||
s6-notifyoncheck -w 500 -c "true &>/dev/null </dev/tcp/127.0.0.1/3350"
|
||||
s6-notifyoncheck -w 500 -c "nc -z localhost 3350"
|
||||
|
||||
/usr/sbin/xrdp-sesman --nodaemon
|
||||
1
root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/type
Normal file
1
root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/type
Normal file
@ -0,0 +1 @@
|
||||
longrun
|
||||
@ -4,10 +4,7 @@
|
||||
fdmove -c 2 1
|
||||
|
||||
# Notify service manager when xrdp is up
|
||||
s6-notifyoncheck -w 500 -c "true &>/dev/null </dev/tcp/127.0.0.1/3389"
|
||||
|
||||
# Wait until other services are running
|
||||
if { s6-svwait -t 10000 -U /var/run/s6/services/xrdp-sesman/ }
|
||||
s6-notifyoncheck -w 500 -c "nc -z localhost 3389"
|
||||
|
||||
# set env
|
||||
s6-env DISPLAY=:1
|
||||
1
root/etc/s6-overlay/s6-rc.d/svc-xrdp/type
Normal file
1
root/etc/s6-overlay/s6-rc.d/svc-xrdp/type
Normal file
@ -0,0 +1 @@
|
||||
longrun
|
||||
@ -1 +0,0 @@
|
||||
3
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
while :
|
||||
do
|
||||
if [[ ! `/usr/bin/pulseaudio --check` ]]; then
|
||||
if [[ ! $(/usr/bin/pulseaudio --check) ]]; then
|
||||
/usr/bin/pulseaudio --start
|
||||
fi
|
||||
sleep 10
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user