From 6c823708273039fb88332079f9e3b925cc1a76e9 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 1b21efc3a564acd9f87e8c15b2b1c92395809a9e 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 535da5b02fd971a4e6b6fb6328d50b11af6d0ec9 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/env.cfg | 2 +- portainer-ce/portainer-agent-stack.yml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/portainer-ce/env.cfg b/portainer-ce/env.cfg index e53d61f..cc4e93e 100644 --- a/portainer-ce/env.cfg +++ b/portainer-ce/env.cfg @@ -1,4 +1,4 @@ # IMAGE_LATEST=portainer/portainer-ce:2.19.4 -IMAGE_LATEST=portainer/portainer-ce:latest +#IMAGE_LATEST=portainer/portainer-ce:latest IMAGE_TAG=portainer/portainer-ce:2.27.1 AGENT_TAG=portainer/agent:2.27.1 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 338cf32b4cc3af8bdaf45b30adffb5c6117114f8 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 6adde4d999dbe55986c474a3050cbce2fae33c27 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