Merge branch 'develop'

This commit is contained in:
aynic.os 2023-01-15 17:18:28 +01:00
commit 004ce85c50
3 changed files with 3 additions and 10 deletions

View File

@ -11,6 +11,7 @@ RUN apt-get update \
basez \ basez \
bash \ bash \
bc \ bc \
ca-certificates \
cron \ cron \
curl \ curl \
dnsutils \ dnsutils \
@ -97,6 +98,7 @@ RUN set -x && buildDeps=' \
&& ln -s /usr/local/src/dpgpid/keygen /usr/local/bin/keygen \ && ln -s /usr/local/src/dpgpid/keygen /usr/local/bin/keygen \
&& chmod 0755 /usr/local/bin/keygen \ && chmod 0755 /usr/local/bin/keygen \
&& /usr/local/bin/keygen --help >/dev/null \ && /usr/local/bin/keygen --help >/dev/null \
&& pip3 install amzqr \
&& rm -rf /root/.cache \ && rm -rf /root/.cache \
&& apt-get clean && apt-get clean
@ -194,12 +196,10 @@ RUN echo "SHELL=/bin/bash" > "/var/spool/cron/crontabs/$USER" \
&& echo "12 20 * * * /bin/bash /home/zen/.zen/Astroport.ONE/20h12.process.sh > /tmp/20h12.log 2>&1" >> "/var/spool/cron/crontabs/$USER" \ && echo "12 20 * * * /bin/bash /home/zen/.zen/Astroport.ONE/20h12.process.sh > /tmp/20h12.log 2>&1" >> "/var/spool/cron/crontabs/$USER" \
&& chown "$USER" "/var/spool/cron/crontabs/$USER" && chown "$USER" "/var/spool/cron/crontabs/$USER"
VOLUME "/home/$USER/.ipfs"
VOLUME "/home/$USER/.zen/game/players" VOLUME "/home/$USER/.zen/game/players"
VOLUME "/home/$USER/Astroport"
# homedir # homedir
RUN mkdir -p "/home/$USER/.ipfs" "/home/$USER/.zen/game/players" "/home/$USER/Astroport" \ RUN mkdir -p "/home/$USER/.zen/game/players" \
&& chown -R "$USER" "/home/$USER" && chown -R "$USER" "/home/$USER"
HEALTHCHECK CMD [ $(ps aux |grep 'nc -l -p' |wc -l) -lt 199 ] && echo -n OK HEALTHCHECK CMD [ $(ps aux |grep 'nc -l -p' |wc -l) -lt 199 ] && echo -n OK

View File

@ -15,8 +15,3 @@ services:
- SERVICE_1234_CHECK_HTTP=/test - SERVICE_1234_CHECK_HTTP=/test
- SERVICE_1234_NAME=${COMPOSE_SERVICE_NAME}-astroport-1234 - SERVICE_1234_NAME=${COMPOSE_SERVICE_NAME}-astroport-1234
- SERVICE_1234_TAGS=${HOST_ASTROPORT_SERVICE_1234_TAGS:-} - SERVICE_1234_TAGS=${HOST_ASTROPORT_SERVICE_1234_TAGS:-}
volumes:
ipfs:
external: true
name: ${COMPOSE_SERVICE_NAME}_ipfs

View File

@ -13,9 +13,7 @@ services:
tty: true tty: true
volumes: volumes:
- home:/home/zen/.zen/game/players:delegated - home:/home/zen/.zen/game/players:delegated
- ipfs:/home/zen/.ipfs:cached,ro
working_dir: /home/zen working_dir: /home/zen
volumes: volumes:
home: home:
ipfs: