Merge branch 'master' of https://git.vbchaos.nl/private/docker-swarm

2024-02-27 15:27:06 +01:00
parent 1560ec9d67 c1168759d5
commit d5257b761f
5 changed files with 102 additions and 32 deletions
@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 docker stack deploy -c portainer-agent-stack.yml portainer
 docker stack deploy -c grafana.yml --with-registry-auth grafana
+=======
+docker stack deploy -c grafana.yml --with-registry-auth swarm
+>>>>>>> c1168759d5f8fa78ce3d46865fda84673dfdb115