|
|
@@ -1,29 +1,32 @@
|
|
|
version: '3.8'
|
|
|
services:
|
|
|
terminalserver:
|
|
|
- image: danielguerra/ubuntu-xrdp
|
|
|
+ image: toastie89/terminalserver
|
|
|
shm_size: '1G'
|
|
|
|
|
|
build:
|
|
|
context: ./build
|
|
|
args:
|
|
|
- ADDITIONAL_PACKAGES: less libreoffice inkscape ttf-bitstream-vera geany geany-plugin-treebrowser geany-plugin-spellcheck geany-plugin-shiftcolumn geany-plugin-vc geany-plugin-git-changebar iputils-ping virt-manager ssh-askpass okular gimp gvfs-backends dnsutils git digikam pdfshuffler xfce4-whiskermenu-plugin galculator gigolo thunar-archive-plugin software-properties-common gajim gajim-httpupload gajim-urlimagepreview gajim-omemo python3-pip pinta curl openjdk-18-jdk
|
|
|
+ ADDITIONAL_PACKAGES: ${ADDITIONAL_PACKAGES}
|
|
|
container_name: terminalserver
|
|
|
hostname: terminalserver
|
|
|
restart: on-failure:3
|
|
|
|
|
|
- ports:
|
|
|
- - "3389:3389"
|
|
|
- - "2222:22"
|
|
|
+# ports:
|
|
|
+# - "3389:3389"
|
|
|
+# - "2222:22"
|
|
|
|
|
|
volumes:
|
|
|
- ./data/home/:/home/
|
|
|
- - ./data/ssh/:/etc/ssh/
|
|
|
- - ./data/opt/:/opt/
|
|
|
- - /opt/docker/terminalserver/data/users.list:/etc/users.list
|
|
|
+ - ./data/etc/s6-overlay/s6-rc.d/init-custom-users:/etc/s6-overlay/s6-rc.d/init-custom-users
|
|
|
+# - ./data/ssh/:/etc/ssh/
|
|
|
+# - ./data/opt/:/opt/
|
|
|
+ - ./data/users.list:/etc/users.list
|
|
|
|
|
|
environment:
|
|
|
- TZ: "Europe/Berlin"
|
|
|
+ - PUID=1000
|
|
|
+ - PGID=1000
|
|
|
+ - TZ="Europe/Berlin"
|
|
|
|
|
|
healthcheck:
|
|
|
test: ["CMD", "/bin/nc", "-z", "localhost", "3389"]
|
|
|
@@ -31,4 +34,3 @@ services:
|
|
|
timeout: 10s
|
|
|
retries: 3
|
|
|
start_period: 2m
|
|
|
-
|
root