From 5fd1bb48c51879286e569b5248e97464a1d63505 Mon Sep 17 00:00:00 2001 From: "aynic.os" Date: Fri, 24 Nov 2023 03:13:06 +0000 Subject: [PATCH] fix docker install --- docker/astroport.mk | 11 ++++++++--- docker/astroport/Dockerfile | 28 ++++++++++++---------------- docker/astroport/Dockerfile.vdi | 32 ++++++++++++++------------------ docker/docker-compose.yml | 2 +- 4 files changed, 35 insertions(+), 38 deletions(-) diff --git a/docker/astroport.mk b/docker/astroport.mk index 5d8873c4..a7992ed9 100644 --- a/docker/astroport.mk +++ b/docker/astroport.mk @@ -1,10 +1,14 @@ +COMPOSE_FILE_HOME := true COMPOSE_IGNORE_ORPHANS := true DOCKER_IMAGES_MYOS := $(if $(COMPOSE_FILE_VDI),x2go:xfce-debian) +ENV := local ENV_VARS += HOST_ASTROPORT_SERVICE_1234_TAGS HOST_ASTROPORT_SERVICE_NAME ?= astroport HOST_ASTROPORT_SERVICE_1234_TAGS ?= $(call tagprefix,HOST_ASTROPORT,1234) HOST_ASTROPORT_UFW_UPDATE := 1234/tcp 12245:12445/tcp 45720/tcp -MAKE_VARS += SSH_PORT User host +HOST_IPFS_PATH := /home/zen/.ipfs +HOST_LB := true +MAKE_VARS += HOST_IPFS_PATH SSH_PORT User host PLAYER_MAKE_VARS := COMPOSE_PROJECT_NAME MAIL IPFS_UFW_DOCKER IPFS_UFW_UPDATE USER_IPFS_SERVICE_PROXY_TCP USER_IPFS_SERVICE_5001_ENVS RESU_HOME RESU_HOST RESU_HOME := mail RESU_HOST := true @@ -12,8 +16,7 @@ SERVICE := astroport SSH_PORT := 45720 SSH_PUBLIC_HOSTS := git.p2p.legal STACK := host -User := User/ipfs -host := host/ipfs +USER_LB := true ifeq ($(PLAYER_API_ONLINE),true) USER_IPFS_SERVICE_5001_ENVS ?= 5001 else ifneq ($(PLAYER_API_PORT),) @@ -22,3 +25,5 @@ IPFS_UFW_UPDATE += $(PLAYER_API_PORT)/tcp USER_IPFS_SERVICE_PROXY_TCP := :$(PLAYER_API_PORT) USER_IPFS_SERVICE_5001_ENVS += proxy endif +User := User/ipfs +host := host/ipfs diff --git a/docker/astroport/Dockerfile b/docker/astroport/Dockerfile index 73a37590..a306c2bc 100644 --- a/docker/astroport/Dockerfile +++ b/docker/astroport/Dockerfile @@ -113,22 +113,18 @@ RUN npm install -g tiddlywiki ARG COMPOSE_REMOTE=https://github.com/docker/compose ARG COMPOSE_VERSION=2.5.0 +ARG IPFS_VERSION=0.24.0 -RUN OS="$(echo ${DOCKER_SYSTEM} |awk '{print tolower($0)}')"; \ - ARCH="$(echo ${DOCKER_MACHINE})"; \ - wget -qO /usr/bin/docker-compose ${COMPOSE_REMOTE}/releases/download/v${COMPOSE_VERSION}/docker-compose-${OS}-${ARCH} \ - && chmod +x /usr/bin/docker-compose - -ARG IPFS_VERSION=0.22.0 - -RUN { OS="$(echo ${DOCKER_SYSTEM} |awk '{print tolower($0)}')"; \ - ARCH="$(echo ${DOCKER_MACHINE})"; \ - wget -qO - https://github.com/koalaman/shellcheck/releases/download/stable/shellcheck-stable.${OS}.${ARCH}.tar.xz \ - |tar --strip-components 1 -C /usr/local/bin -xJf - shellcheck-stable/shellcheck; } \ - && { OS="$(echo ${DOCKER_SYSTEM} |awk '{print tolower($0)}')"; \ - ARCH="$(echo ${DOCKER_MACHINE} |awk '/x86_64/ {print "amd64"}; /aarch64/ {print "arm64"}')"; \ - wget -qO - https://github.com/ipfs/kubo/releases/download/v${IPFS_VERSION}/kubo_v${IPFS_VERSION}_${OS}-${ARCH}.tar.gz \ - |tar --strip-components 1 -C /usr/local/bin -xzf - kubo/ipfs; } \ +RUN OS="$(echo ${DOCKER_SYSTEM} |awk '{print tolower($0)}')" \ + && ARCH="$(echo ${DOCKER_MACHINE} |awk '{print /armv7l/ ? "armv7" : $0}')" \ + && wget -qO /usr/bin/docker-compose ${COMPOSE_REMOTE}/releases/download/v${COMPOSE_VERSION}/docker-compose-${OS}-${ARCH} \ + && chmod +x /usr/bin/docker-compose \ + && ARCH="$(echo ${DOCKER_MACHINE})" \ + && wget -qO - https://github.com/koalaman/shellcheck/releases/download/stable/shellcheck-stable.${OS}.${ARCH}.tar.xz \ + |tar --strip-components 1 -C /usr/local/bin -xJf - shellcheck-stable/shellcheck \ + && ARCH="$(echo ${DOCKER_MACHINE} |awk '{print /x86_64/ ? "amd64" : /arch64/ ? "arm64" : /armv(6|7)/ ? "arm" : $0}')" \ + && wget -qO - https://github.com/ipfs/kubo/releases/download/v${IPFS_VERSION}/kubo_v${IPFS_VERSION}_${OS}-${ARCH}.tar.gz \ + |tar --strip-components 1 -C /usr/local/bin -xzf - kubo/ipfs \ && mkdir -p /usr/local/lib/shellspec \ && wget -qO - https://github.com/shellspec/shellspec/archive/refs/heads/master.tar.gz \ |tar --strip-components 1 -C /usr/local/lib/shellspec -xzf - \ @@ -195,7 +191,7 @@ fi RUN echo "$USER ALL=(ALL:ALL) NOPASSWD: ALL" > "/etc/sudoers.d/$USER" # config ssmtp -RUN echo "$USER:support@g1sms.fr:mail.g1sms.fr:645" >> /etc/ssmtp/revaliases +RUN echo "$USER:support@g1sms.fr:mail.asycn.io:587" >> /etc/ssmtp/revaliases # config crontab RUN echo "SHELL=/bin/bash" > "/var/spool/cron/crontabs/$USER" \ diff --git a/docker/astroport/Dockerfile.vdi b/docker/astroport/Dockerfile.vdi index ac7b9f03..bc71dc52 100644 --- a/docker/astroport/Dockerfile.vdi +++ b/docker/astroport/Dockerfile.vdi @@ -87,18 +87,18 @@ RUN set -x && buildDeps=' \ && mkdir -p /usr/local/src/jaklis \ && wget -qO - https://github.com/aynicos/jaklis/archive/master.tar.gz \ |tar --strip-components 1 -C /usr/local/src/jaklis -xzf - \ - && pip3 install -r /usr/local/src/jaklis/requirements.txt \ + && pip3 install --break-system-packages -r /usr/local/src/jaklis/requirements.txt \ && ln -s /usr/local/src/jaklis/jaklis.py /usr/local/bin/jaklis \ && chmod 0755 /usr/local/bin/jaklis \ && /usr/local/bin/jaklis --help >/dev/null \ && mkdir -p /usr/local/src/dpgpid \ && wget -qO - https://github.com/aynicos/dpgpid/archive/master.tar.gz \ |tar --strip-components 1 -C /usr/local/src/dpgpid -xzf - \ - && pip3 install -r /usr/local/src/dpgpid/requirements.txt \ + && pip3 install --break-system-packages -r /usr/local/src/dpgpid/requirements.txt \ && ln -s /usr/local/src/dpgpid/keygen /usr/local/bin/keygen \ && chmod 0755 /usr/local/bin/keygen \ && /usr/local/bin/keygen --help >/dev/null \ - && pip3 install amzqr \ + && pip3 install --break-system-packages amzqr pdf2docx pyppeteer \ && rm -rf /root/.cache \ && apt-get clean @@ -106,22 +106,18 @@ RUN npm install -g tiddlywiki ARG COMPOSE_REMOTE=https://github.com/docker/compose ARG COMPOSE_VERSION=2.5.0 +ARG IPFS_VERSION=0.24.0 -RUN OS="$(echo ${DOCKER_SYSTEM} |awk '{print tolower($0)}')"; \ - ARCH="$(echo ${DOCKER_MACHINE})"; \ - wget -qO /usr/bin/docker-compose ${COMPOSE_REMOTE}/releases/download/v${COMPOSE_VERSION}/docker-compose-${OS}-${ARCH} \ - && chmod +x /usr/bin/docker-compose - -ARG IPFS_VERSION=0.16.0 - -RUN { OS="$(echo ${DOCKER_SYSTEM} |awk '{print tolower($0)}')"; \ - ARCH="$(echo ${DOCKER_MACHINE})"; \ - wget -qO - https://github.com/koalaman/shellcheck/releases/download/stable/shellcheck-stable.${OS}.${ARCH}.tar.xz \ - |tar --strip-components 1 -C /usr/local/bin -xJf - shellcheck-stable/shellcheck; } \ - && { OS="$(echo ${DOCKER_SYSTEM} |awk '{print tolower($0)}')"; \ - ARCH="$(echo ${DOCKER_MACHINE} |awk '/x86_64/ {print "amd64"}; /aarch64/ {print "arm64"}')"; \ - wget -qO - https://github.com/ipfs/kubo/releases/download/v${IPFS_VERSION}/kubo_v${IPFS_VERSION}_${OS}-${ARCH}.tar.gz \ - |tar --strip-components 1 -C /usr/local/bin -xzf - kubo/ipfs; } \ +RUN OS="$(echo ${DOCKER_SYSTEM} |awk '{print tolower($0)}')" \ + && ARCH="$(echo ${DOCKER_MACHINE} |awk '{print /armv7l/ ? "armv7" : $0}')" \ + && wget -qO /usr/bin/docker-compose ${COMPOSE_REMOTE}/releases/download/v${COMPOSE_VERSION}/docker-compose-${OS}-${ARCH} \ + && chmod +x /usr/bin/docker-compose \ + && ARCH="$(echo ${DOCKER_MACHINE})" \ + && wget -qO - https://github.com/koalaman/shellcheck/releases/download/stable/shellcheck-stable.${OS}.${ARCH}.tar.xz \ + |tar --strip-components 1 -C /usr/local/bin -xJf - shellcheck-stable/shellcheck \ + && ARCH="$(echo ${DOCKER_MACHINE} |awk '{print /x86_64/ ? "amd64" : /arch64/ ? "arm64" : /armv(6|7)/ ? "arm" : $0}')" \ + && wget -qO - https://github.com/ipfs/kubo/releases/download/v${IPFS_VERSION}/kubo_v${IPFS_VERSION}_${OS}-${ARCH}.tar.gz \ + |tar --strip-components 1 -C /usr/local/bin -xzf - kubo/ipfs \ && mkdir -p /usr/local/lib/shellspec \ && wget -qO - https://github.com/shellspec/shellspec/archive/refs/heads/master.tar.gz \ |tar --strip-components 1 -C /usr/local/lib/shellspec -xzf - \ diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 5ffafba3..758b1530 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -5,7 +5,7 @@ services: build: args: - DOCKER_BUILD_DIR=docker/astroport - - IPFS_VERSION=${IPFS_VERSION:-0.20.0} + - IPFS_VERSION=${IPFS_VERSION:-0.24.0} context: ../ dockerfile: docker/astroport/Dockerfile restart: unless-stopped