Merge branch 'master' into master

harricross · Nov 3, 2021 · 96c1a5f · 96c1a5f
2 parents 12e32e9 + 72b20dd
commit 96c1a5f
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 5 deletions.
diff --git a/stacks/portainer-agent-dev/docker-stack.yml b/stacks/portainer-agent-dev/docker-stack.yml
@@ -0,0 +1,24 @@
+version: '3.2'
+
+services:
+  agent:
+    image: portainer/agent:develop
+    environment:
+      AGENT_CLUSTER_ADDR: tasks.agent
+      AGENT_PORT: 9002
+      LOG_LEVEL: DEBUG
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    ports:
+      - target: 9002
+        published: 9002
+        protocol: tcp
+        mode: host
+    networks:
+      - portainer_agent
+    deploy:
+      mode: global
+
+networks:
+  portainer_agent:
+    driver: overlay
diff --git a/templates.json b/templates.json
@@ -719,10 +719,23 @@
     "platform": "linux",
     "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/portainer.png",
     "repository": {
-      "url": "https://github.com/portainer/templates",
+      "url": "https://github.com/deviantony/templates",
       "stackfile": "stacks/portainer-agent/docker-stack.yml"
     }
   },
+  {
+    "type": "stack",
+    "title": "Portainer Agent (develop)",
+    "description": "Manage all the resources in your Swarm cluster",
+    "note": "The agent will be deployed globally inside your cluster and available on port 9002.",
+    "categories": ["portainer"],
+    "platform": "linux",
+    "logo": "https://portainer.io/images/logos/portainer.png",
+    "repository": {
+      "url": "https://github.com/deviantony/templates",
+      "stackfile": "stacks/portainer-agent-dev/docker-stack.yml"
+    }
+  },
   {
     "type": "stack",
     "title": "OpenFaaS",
@@ -746,7 +759,7 @@
     "platform": "linux",
     "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/ironfunctions.png",
     "repository": {
-      "url": "https://github.com/portainer/templates",
+      "url": "https://github.com/deviantony/templates",
       "stackfile": "stacks/ironfunctions/docker-stack.yml"
     }
   },
@@ -759,7 +772,7 @@
     "platform": "linux",
     "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/cockroachdb.png",
     "repository": {
-      "url": "https://github.com/portainer/templates",
+      "url": "https://github.com/deviantony/templates",
       "stackfile": "stacks/cockroachdb/docker-stack.yml"
     }
   },
@@ -772,7 +785,7 @@
     "platform": "linux",
     "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/wordpress.png",
     "repository": {
-      "url": "https://github.com/portainer/templates",
+      "url": "https://github.com/deviantony/templates",
       "stackfile": "stacks/wordpress/docker-stack.yml"
     },
     "env": [
@@ -815,7 +828,7 @@
     "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/sematext_agent.png",
     "platform": "linux",
     "repository": {
-      "url": "https://github.com/portainer/templates",
+      "url": "https://github.com/deviantony/templates",
       "stackfile": "stacks/sematext-agent-docker/docker-stack.yml"
     },
     "env": [