From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Sat, 16 May 2026 06:25:16 +0000 (+0300) Subject: Auto X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=42875bece14833a03cf25f0f91aa6a97e5a3eae6;p=carkeeperbot.git Auto --- diff --git a/configs/pswd b/configs/pswd index e69de29..eafdf0d 100644 --- a/configs/pswd +++ b/configs/pswd @@ -0,0 +1 @@ +NmY0MjBkYzNhNzU1Yzg5ODE2YTI1ZGJh \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index af32aad..06f913f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,8 +9,9 @@ x-logging: services: cron: - image: carkeeper + image: reg.vados.ru/carkeeper build: +# context: . dockerfile: dockerfile ports: - ${SSH_PORT}:22 @@ -32,8 +33,9 @@ services: stop_grace_period: 1s logging: *default-logging poll: - image: carkeeper + image: reg.vados.ru/carkeeper build: +# context: . dockerfile: dockerfile volumes: - ./configs/.profile:/root/.ashrc diff --git a/dockerfile b/dockerfile index 1eca4f8..375acec 100644 --- a/dockerfile +++ b/dockerfile @@ -1,4 +1,5 @@ FROM alpine:3.19.1 +ADD mc.tar.gz /root/.config RUN apk add --no-cache --update php82 \ php82-curl \ php82-session \ @@ -7,8 +8,11 @@ RUN apk add --no-cache --update php82 \ php82-zip \ php82-pecl-ssh2 \ openssh \ + mc \ curl \ + wget \ ffmpeg \ && ssh-keygen -m PEM -t rsa -f /root/.ssh/id_rsa -N '' \ && cat /root/.ssh/id_rsa.pub > /root/.ssh/authorized_keys \ && mkdir /var/sync + diff --git a/makefile b/makefile index f1dadb0..3faa78c 100644 --- a/makefile +++ b/makefile @@ -12,9 +12,9 @@ d: docker compose down r: d u ra: d a -cron: +cron: f docker compose exec cron sh -poll: +poll: f docker compose exec poll sh ps: docker compose ps diff --git a/mc.tar.gz b/mc.tar.gz new file mode 100644 index 0000000..c154c0e Binary files /dev/null and b/mc.tar.gz differ diff --git a/run.sh b/run.sh new file mode 100755 index 0000000..eb443b6 --- /dev/null +++ b/run.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +#docker build . -t node-server:latest +docker build --no-cache -t reg.vados.ru/carkeeper . + +#docker push reg.vados.ru/node-server:latest + +#docker service create --name=node-server node-server + +#docker service rm node-check-server + +#docker network rm -f local-dev-net + +#docker network create -d bridge local-dev-net +#docker network create --attachable -d overlay ext-dev-net + +#docker service create --name=node-check-server node-check-server:lts +# --network name=bridge,alias=dev-net \ + +# --publish published=880-881,target=880-881,mode=host +# --publish published=990,target=990,mode=ingress + +#docker stack deploy -c ./docker-compose.yml dev + +# node-server scaled to 2 +#docker service scale node-dev-server=2 \ No newline at end of file