From 1c743d68c411ded32f3014d77cb7d6518c2d52e5 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Wed, 26 Mar 2025 17:49:22 +0800 Subject: [PATCH 1/5] modify(all): modify portainer-agent-stack --- portainer-ce/portainer-agent-stack.yml | 5 +++++ tasks.md/stack.yml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/portainer-ce/portainer-agent-stack.yml b/portainer-ce/portainer-agent-stack.yml index b29e280..140d1de 100644 --- a/portainer-ce/portainer-agent-stack.yml +++ b/portainer-ce/portainer-agent-stack.yml @@ -1,3 +1,4 @@ +# docker stack deploy -c./portainer-ce/portainer-agent-stack.yml base version: '3.2' services: @@ -6,6 +7,8 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - /data/docker/volumes:/var/lib/docker/volumes + env_file: + - ./env.cfg networks: - agent_network deploy: @@ -22,6 +25,8 @@ services: - "8000:8000" volumes: - portainer_data:/data + env_file: + - ./env.cfg networks: - agent_network deploy: diff --git a/tasks.md/stack.yml b/tasks.md/stack.yml index 5a288dd..38e0c73 100644 --- a/tasks.md/stack.yml +++ b/tasks.md/stack.yml @@ -1,6 +1,6 @@ # path:: mkdir -pv /data/volumes/tasks.md/{tasks,config} -# pull:: docker compose -p memos --env-file ./tasks.md/env.cfg -f ./tasks.md/stack.yml pull -# run:: docker compose -p memos --env-file ./tasks.md/env.cfg -f ./tasks.md/stack.yml up -d +# pull:: docker tasks.md -p memos --env-file ./tasks.md/env.cfg -f ./tasks.md/stack.yml pull +# run:: docker tasks.md -p memos --env-file ./tasks.md/env.cfg -f ./tasks.md/stack.yml up -d services: tasks.md: From 707863ae9d5a1b88ece6a2ab9980f4e79de854e4 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Wed, 26 Mar 2025 17:49:22 +0800 Subject: [PATCH 2/5] modify(all): modify portainer-agent-stack + --- portainer-ce/portainer-agent-stack.yml | 5 +++++ tasks.md/stack.yml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/portainer-ce/portainer-agent-stack.yml b/portainer-ce/portainer-agent-stack.yml index b29e280..140d1de 100644 --- a/portainer-ce/portainer-agent-stack.yml +++ b/portainer-ce/portainer-agent-stack.yml @@ -1,3 +1,4 @@ +# docker stack deploy -c./portainer-ce/portainer-agent-stack.yml base version: '3.2' services: @@ -6,6 +7,8 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - /data/docker/volumes:/var/lib/docker/volumes + env_file: + - ./env.cfg networks: - agent_network deploy: @@ -22,6 +25,8 @@ services: - "8000:8000" volumes: - portainer_data:/data + env_file: + - ./env.cfg networks: - agent_network deploy: diff --git a/tasks.md/stack.yml b/tasks.md/stack.yml index 5a288dd..38e0c73 100644 --- a/tasks.md/stack.yml +++ b/tasks.md/stack.yml @@ -1,6 +1,6 @@ # path:: mkdir -pv /data/volumes/tasks.md/{tasks,config} -# pull:: docker compose -p memos --env-file ./tasks.md/env.cfg -f ./tasks.md/stack.yml pull -# run:: docker compose -p memos --env-file ./tasks.md/env.cfg -f ./tasks.md/stack.yml up -d +# pull:: docker tasks.md -p memos --env-file ./tasks.md/env.cfg -f ./tasks.md/stack.yml pull +# run:: docker tasks.md -p memos --env-file ./tasks.md/env.cfg -f ./tasks.md/stack.yml up -d services: tasks.md: From 7c1264b198b6977ec8237641af3245a973ffbd76 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Wed, 26 Mar 2025 18:14:48 +0800 Subject: [PATCH 3/5] modify(all): modify portainer-agent-stack + --- portainer-ce/portainer-agent-stack.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/portainer-ce/portainer-agent-stack.yml b/portainer-ce/portainer-agent-stack.yml index 140d1de..6387fe7 100644 --- a/portainer-ce/portainer-agent-stack.yml +++ b/portainer-ce/portainer-agent-stack.yml @@ -1,5 +1,4 @@ -# docker stack deploy -c./portainer-ce/portainer-agent-stack.yml base -version: '3.2' +# docker stack deploy -c ./portainer-ce/portainer-agent-stack.yml base services: agent: @@ -21,7 +20,6 @@ services: command: -H tcp://tasks.agent:9001 --tlsskipverify ports: - "9000:9000" - - "9443:9443" - "8000:8000" volumes: - portainer_data:/data From d0be71342151426423c051672381d2faa5aa4a37 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Wed, 26 Mar 2025 18:22:07 +0800 Subject: [PATCH 4/5] modify(all): modify portainer-agent-stack +2 --- portainer-ce/portainer-agent-stack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portainer-ce/portainer-agent-stack.yml b/portainer-ce/portainer-agent-stack.yml index b29e280..5999999 100644 --- a/portainer-ce/portainer-agent-stack.yml +++ b/portainer-ce/portainer-agent-stack.yml @@ -1,4 +1,4 @@ -version: '3.2' +# RUN:: docker stack deploy -c <(docker compose --env-file ./env.cfg -f ./portainer-agent-stack.yml config) base services: agent: From 3040b7500f5e1844be0d0f0fa80c00944c700710 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Wed, 26 Mar 2025 18:27:25 +0800 Subject: [PATCH 5/5] modify(all): modify portainer-agent-stack +3 --- portainer-ce/portainer-agent-stack.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/portainer-ce/portainer-agent-stack.yml b/portainer-ce/portainer-agent-stack.yml index 5999999..fe7f30f 100644 --- a/portainer-ce/portainer-agent-stack.yml +++ b/portainer-ce/portainer-agent-stack.yml @@ -2,7 +2,7 @@ services: agent: - image: ${AGENT_TAG} + image: portainer/agent:2.27.1 volumes: - /var/run/docker.sock:/var/run/docker.sock - /data/docker/volumes:/var/lib/docker/volumes @@ -14,11 +14,10 @@ services: constraints: [node.platform.os == linux] portainer: - image: ${IMAGE_TAG} + image: portainer/portainer-ce:2.27.1 command: -H tcp://tasks.agent:9001 --tlsskipverify ports: - "9000:9000" - - "9443:9443" - "8000:8000" volumes: - portainer_data:/data