From 08c287bbb0bc6a35886d070d133556cd006eefc3 Mon Sep 17 00:00:00 2001 From: Yann Autissier Date: Sun, 27 Nov 2022 02:33:13 +0000 Subject: [PATCH 1/4] fix --- .env.dist | 9 --------- Makefile | 2 +- docker/astroport/Dockerfile | 1 + docker/docker-compose.app.yml | 5 ++++- docker/docker-compose.vdi.yml | 18 ++++++++++++------ docker/stack.mk | 9 ++++++--- 6 files changed, 24 insertions(+), 20 deletions(-) delete mode 100644 .env.dist diff --git a/.env.dist b/.env.dist deleted file mode 100644 index 566cb2fe..00000000 --- a/.env.dist +++ /dev/null @@ -1,9 +0,0 @@ -DOCKER_IMAGES_MYOS=x2go:xfce-debian -NODE_ASTROPORT_SERVICE_1234_TAGS=urlprefix-astroport.${DOMAIN}/ -NODE_VDI_ECRYPTERS=zen -NODE_VDI_LANG=${LANG} -NODE_VDI_PORT=45720 -NODE_VDI_SUDOERS= -NODE_VDI_TZ=UTC -NODE_VDI_USERS=zen -UFW_UPDATE_ASTROPORT=1234 12245:12445/tcp diff --git a/Makefile b/Makefile index 99b1a537..194e5ba9 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ SHELL_FILES ?= $(wildcard .*/*.sh */*.sh */*/*.sh) all: install tests -install: myos-node player-build up +install: myos-node build player-build docker-network-create-$(USER) player up player: STACK := User player: diff --git a/docker/astroport/Dockerfile b/docker/astroport/Dockerfile index 80994c6f..adc72651 100644 --- a/docker/astroport/Dockerfile +++ b/docker/astroport/Dockerfile @@ -8,6 +8,7 @@ ARG DOCKER_SYSTEM=Linux RUN apt-get update \ && apt-get -fy upgrade \ && DEBIAN_FRONTEND=noninteractive apt-get -fy install \ + basez \ bash \ bc \ cron \ diff --git a/docker/docker-compose.app.yml b/docker/docker-compose.app.yml index 14b3de07..42ffc8f1 100644 --- a/docker/docker-compose.app.yml +++ b/docker/docker-compose.app.yml @@ -15,9 +15,12 @@ services: labels: - SERVICE_1234_CHECK_HTTP=/test - SERVICE_1234_NAME=${COMPOSE_SERVICE_NAME}-astroport-1234 - - SERVICE_1234_TAGS=${NODE_ASTROPORT_SERVICE_1234_TAGS} + - SERVICE_1234_TAGS=${NODE_ASTROPORT_SERVICE_1234_TAGS:-} + volumes: + - dns:/dns volumes: + dns: ipfs: external: true name: ${COMPOSE_SERVICE_NAME}_ipfs diff --git a/docker/docker-compose.vdi.yml b/docker/docker-compose.vdi.yml index 4003a9c9..0ec7268f 100644 --- a/docker/docker-compose.vdi.yml +++ b/docker/docker-compose.vdi.yml @@ -2,9 +2,6 @@ version: '3.8' services: astroport: - build: - args: - - SSH_PORT=${NODE_VDI_PORT:-22} cap_add: - IPC_LOCK # ecryptfs - NET_ADMIN # iptables @@ -12,12 +9,20 @@ services: - SYS_ADMIN # ecryptfs environment: - DEBUG=${VDI_DEBUG:-} - - ECRYPTERS=${NODE_VDI_ECRYPTERS:-} + - ECRYPTERS=${NODE_VDI_ECRYPTERS:-zen} - LANG=${NODE_VDI_LANG:-} + - RC_00_SOURCE=${USER_RC_SOURCE:-/etc/profile.d/rc_functions.sh} + - RC_01_PS1_SET=${USER_RC_PS1_SET:-true} + - RC_02_PROMPT_SET=${USER_RC_PROMPT_SET:-true} + - RC_03_SSH_ADD=${USER_RC_SSH_ADD:-true} + - RC_04_TMUX_ATTACH=${USER_RC_TMUX_ATTACH:-false} + - RC_05_SCREEN_ATTACH=${USER_RC_SCREEN_ATTACH:-true} - SSH_AUTHORIZED_KEYS=${SSH_AUTHORIZED_KEYS:-} - - SSH_PORT=${NODE_VDI_PORT:-22} + - SSH_PORT=${SSH_PORT:-22} - SSH_PUBLIC_HOSTS=${SSH_PUBLIC_HOSTS:-} - - SUDOERS=${NODE_VDI_SUDOERS:-} + - SUDOERS=${NODE_VDI_SUDOERS:-:-${USER}} + - TZ=${NODE_VDI_TZ:-:-{TZ}} + - USERS=${NODE_VDI_USERS:-zen} security_opt: - apparmor=unconfined # ecryptfs - seccomp=unconfined # ecryptfs @@ -26,6 +31,7 @@ services: - /etc/localtime:/etc/localtime:ro - /etc/default/console-setup:/etc/default/console-setup:ro - /etc/default/keyboard:/etc/default/keyboard:ro + - /var/run/docker.sock:/var/run/docker.sock:ro - home:/home:delegated - shared:/shared:cached - shm:/dev/shm:delegated diff --git a/docker/stack.mk b/docker/stack.mk index 47e9078e..18b66063 100644 --- a/docker/stack.mk +++ b/docker/stack.mk @@ -1,9 +1,12 @@ +DOCKER_IMAGES_MYOS := x2go:xfce-debian +ENV_VARS += NODE_ASTROPORT_SERVICE_1234_TAGS COMPOSE_FILE_VDI := true -MAKE_VARS += NODE_VDI_PORT User node +MAKE_VARS += SSH_PORT User node +NODE_ASTROPORT_SERVICE_1234_TAGS ?= urlprefix-astroport.$(DOMAIN)/ SERVICE := astroport -SSH_PORT := $(NODE_VDI_PORT) +SSH_PORT := 45720 SSH_PUBLIC_HOSTS += git.p2p.legal STACK := node -UFW_UPDATE := $(SERVICE) +UFW_UPDATE_ASTROPORT := 1234/tcp 12245:12445/tcp 45720/tcp User := User/ipfs node := node/ipfs From 779a823456da0cfe1b40a2fc7586b9ddef71d3e8 Mon Sep 17 00:00:00 2001 From: Boris Date: Sun, 27 Nov 2022 16:13:14 +0100 Subject: [PATCH 2/4] bobo's fix --- .env.dist | 2 ++ Makefile | 4 ++-- docker/astroport/.bash_aliases | 32 ++++++++++++++++++++++++++++++++ docker/astroport/Dockerfile | 1 + docker/docker-compose.vdi.yml | 2 +- 5 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 .env.dist create mode 100644 docker/astroport/.bash_aliases diff --git a/.env.dist b/.env.dist new file mode 100644 index 00000000..e940ef0c --- /dev/null +++ b/.env.dist @@ -0,0 +1,2 @@ +DOCKER_COMPOSE_VDI=true +DOMAIN=localhost diff --git a/Makefile b/Makefile index 194e5ba9..baa7dbaf 100644 --- a/Makefile +++ b/Makefile @@ -9,10 +9,10 @@ SHELL_FILES ?= $(wildcard .*/*.sh */*.sh */*/*.sh) all: install tests -install: myos-node build player-build docker-network-create-$(USER) player up +install: build myos-node up player player: STACK := User -player: +player: docker-network-create-$(USER) $(call make,stack-User-$(if $(DELETE),down,up),$(MYOS),COMPOSE_PROJECT_NAME MAIL) player-%: STACK := User diff --git a/docker/astroport/.bash_aliases b/docker/astroport/.bash_aliases new file mode 100644 index 00000000..a661a69b --- /dev/null +++ b/docker/astroport/.bash_aliases @@ -0,0 +1,32 @@ +alias Marge='git merge' +alias gif='gif diff' +alias chicken='git checkout' +alias vala='cd' +alias Guy_te_fait_chier='git fetch' +alias poule='git pull' +alias poussez='git push' +alias pousseez='git push' +alias pousseeez='git push' +alias pousseeeez='git push' +alias pousseeeeez='git push' +alias pousseeeeeez='git push' +alias pousseeeeeeez='git push' +alias pousseeeeeeeez='git push' +alias pousseeeeeeeeez='git push' +alias pousseeeeeeeeeez='git push' +alias pousseeeeeeeeeeez='git push' +alias pousseeeeeeeeeeeez='git push' +alias pousseeeeeeeeeeeeez='git push' +alias pousseeeeeeeeeeeeeez='git push' +alias pousseeeeeeeeeeeeeeez='git push' +alias pousseeeeeeeeeeeeeeeez='git push' +alias pousseeeeeeeeeeeeeeeeez='git push' +alias pousseeeeeeeeeeeeeeeeeez='git push' +alias pousseeeeeeeeeeeeeeeeeeez='git push' +alias pousseeeeeeeeeeeeeeeeeeeez='git push' +alias pousseeeeeeeeeeeeeeeeeeeeez='git push' +alias pousseeeeeeeeeeeeeeeeeeeeeez='git push' +alias pousseeeeeeeeeeeeeeeeeeeeeeez='git push' +alias pousseeeeeeeeeeeeeeeeeeeeeeeez='git push' +alias pousseeeeeeeeeeeeeeeeeeeeeeeeez='git push' + diff --git a/docker/astroport/Dockerfile b/docker/astroport/Dockerfile index adc72651..50d1faa7 100644 --- a/docker/astroport/Dockerfile +++ b/docker/astroport/Dockerfile @@ -127,6 +127,7 @@ EXPOSE 1234 12345 COPY install.sh /install.sh COPY ${DOCKER_BUILD_DIR}/*.sh /app/ +COPY ${DOCKER_BUILD_DIR}/.*aliases /etc/skel/ CMD ["/app/astroport.sh", "start"] FROM dist as master diff --git a/docker/docker-compose.vdi.yml b/docker/docker-compose.vdi.yml index 0ec7268f..b4120f48 100644 --- a/docker/docker-compose.vdi.yml +++ b/docker/docker-compose.vdi.yml @@ -20,7 +20,7 @@ services: - SSH_AUTHORIZED_KEYS=${SSH_AUTHORIZED_KEYS:-} - SSH_PORT=${SSH_PORT:-22} - SSH_PUBLIC_HOSTS=${SSH_PUBLIC_HOSTS:-} - - SUDOERS=${NODE_VDI_SUDOERS:-:-${USER}} + - SUDOERS=${NODE_VDI_SUDOERS:-zen} - TZ=${NODE_VDI_TZ:-:-{TZ}} - USERS=${NODE_VDI_USERS:-zen} security_opt: From a8941d0b17b4ebfbf582320bb1787f9aa3442c1e Mon Sep 17 00:00:00 2001 From: Yann Autissier Date: Mon, 28 Nov 2022 20:17:28 +0100 Subject: [PATCH 3/4] players --- docker/astroport/Dockerfile | 6 +++--- docker/docker-compose.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/astroport/Dockerfile b/docker/astroport/Dockerfile index 50d1faa7..653080b7 100644 --- a/docker/astroport/Dockerfile +++ b/docker/astroport/Dockerfile @@ -186,12 +186,12 @@ RUN echo "SHELL=/bin/bash" > "/var/spool/cron/crontabs/$USER" \ && chown "$USER" "/var/spool/cron/crontabs/$USER" VOLUME "/home/$USER/.ipfs" -VOLUME "/home/$USER/.zen" +VOLUME "/home/$USER/.zen/game/players" VOLUME "/home/$USER/Astroport" # homedir -RUN mkdir -p "/home/$USER/.ipfs" "/home/$USER/.zen" "/home/$USER/Astroport" \ - && chown "$USER" "/home/$USER/.ipfs" "/home/$USER/.zen" "/home/$USER/Astroport" +RUN mkdir -p "/home/$USER/.ipfs" "/home/$USER/.zen/game/players" "/home/$USER/Astroport" \ + && chown "$USER" "/home/$USER/.ipfs" "/home/$USER/.zen/game/players" "/home/$USER/Astroport" HEALTHCHECK CMD [ $(ps aux |grep 'nc -l -p' |wc -l) -lt 199 ] && echo -n OK diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index f9f14862..fba3bd77 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -13,11 +13,11 @@ services: tty: true volumes: - data:/home/zen/Astroport:cached + - home:/home/zen/.zen/game/players:delegated - ipfs:/home/zen/.ipfs:cached,ro - - zen:/home/zen/.zen:delegated working_dir: /home/zen volumes: data: + home: ipfs: - zen: From 83b4422502e26a0a6d07dca9501500b5854799b3 Mon Sep 17 00:00:00 2001 From: Yann Autissier Date: Tue, 29 Nov 2022 19:13:38 +0000 Subject: [PATCH 4/4] node is host --- docker/docker-compose.app.yml | 6 +++--- docker/docker-compose.vdi.yml | 10 +++++----- docker/stack.mk | 24 ++++++++++++------------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docker/docker-compose.app.yml b/docker/docker-compose.app.yml index 42ffc8f1..c1c5558c 100644 --- a/docker/docker-compose.app.yml +++ b/docker/docker-compose.app.yml @@ -5,8 +5,8 @@ services: build: args: - DOCKER_REPOSITORY=${DOCKER_REPOSITORY} - - GID=${NODE_GID} - - UID=${NODE_UID} + - GID=${HOST_GID} + - UID=${HOST_UID} container_name: ${COMPOSE_PROJECT_NAME}-astroport environment: - ENV=${ENV} @@ -15,7 +15,7 @@ services: labels: - SERVICE_1234_CHECK_HTTP=/test - SERVICE_1234_NAME=${COMPOSE_SERVICE_NAME}-astroport-1234 - - SERVICE_1234_TAGS=${NODE_ASTROPORT_SERVICE_1234_TAGS:-} + - SERVICE_1234_TAGS=${HOST_ASTROPORT_SERVICE_1234_TAGS:-} volumes: - dns:/dns diff --git a/docker/docker-compose.vdi.yml b/docker/docker-compose.vdi.yml index b4120f48..0690de0e 100644 --- a/docker/docker-compose.vdi.yml +++ b/docker/docker-compose.vdi.yml @@ -9,8 +9,8 @@ services: - SYS_ADMIN # ecryptfs environment: - DEBUG=${VDI_DEBUG:-} - - ECRYPTERS=${NODE_VDI_ECRYPTERS:-zen} - - LANG=${NODE_VDI_LANG:-} + - ECRYPTERS=${HOST_VDI_ECRYPTERS:-zen} + - LANG=${HOST_VDI_LANG:-} - RC_00_SOURCE=${USER_RC_SOURCE:-/etc/profile.d/rc_functions.sh} - RC_01_PS1_SET=${USER_RC_PS1_SET:-true} - RC_02_PROMPT_SET=${USER_RC_PROMPT_SET:-true} @@ -20,9 +20,9 @@ services: - SSH_AUTHORIZED_KEYS=${SSH_AUTHORIZED_KEYS:-} - SSH_PORT=${SSH_PORT:-22} - SSH_PUBLIC_HOSTS=${SSH_PUBLIC_HOSTS:-} - - SUDOERS=${NODE_VDI_SUDOERS:-zen} - - TZ=${NODE_VDI_TZ:-:-{TZ}} - - USERS=${NODE_VDI_USERS:-zen} + - SUDOERS=${HOST_VDI_SUDOERS:-zen} + - TZ=${HOST_VDI_TZ:-:-{TZ}} + - USERS=${HOST_VDI_USERS:-zen} security_opt: - apparmor=unconfined # ecryptfs - seccomp=unconfined # ecryptfs diff --git a/docker/stack.mk b/docker/stack.mk index 18b66063..8e8efa88 100644 --- a/docker/stack.mk +++ b/docker/stack.mk @@ -1,12 +1,12 @@ -DOCKER_IMAGES_MYOS := x2go:xfce-debian -ENV_VARS += NODE_ASTROPORT_SERVICE_1234_TAGS -COMPOSE_FILE_VDI := true -MAKE_VARS += SSH_PORT User node -NODE_ASTROPORT_SERVICE_1234_TAGS ?= urlprefix-astroport.$(DOMAIN)/ -SERVICE := astroport -SSH_PORT := 45720 -SSH_PUBLIC_HOSTS += git.p2p.legal -STACK := node -UFW_UPDATE_ASTROPORT := 1234/tcp 12245:12445/tcp 45720/tcp -User := User/ipfs -node := node/ipfs +COMPOSE_FILE_VDI := true +DOCKER_IMAGES_MYOS := x2go:xfce-debian +ENV_VARS += HOST_ASTROPORT_SERVICE_1234_TAGS +HOST_ASTROPORT_SERVICE_1234_TAGS ?= urlprefix-astroport.$(DOMAIN)/ +HOST_ASTROPORT_UFW_UPDATE := 1234/tcp 12245:12445/tcp 45720/tcp +MAKE_VARS += SSH_PORT User host +SERVICE := astroport +SSH_PORT := 45720 +SSH_PUBLIC_HOSTS := git.p2p.legal +STACK := host +User := User/ipfs +host := host/ipfs