diff --git a/docker-compose.yml b/docker-compose.yml index 0ab9023..c32f2d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: - badge-net volumes: - "/var/run/docker.sock:/var/run/docker.sock:ro" - - "./traefik:/data" + - "/home/trav/portainer/traefik:/etc/traefik:rw" deploy: mode: replicated replicas: 1 @@ -22,14 +22,17 @@ services: - "traefik.enable=false" agent: + container_name: portainer-agent image: portainer/agent:lts environment: # REQUIRED: Should be equal to the service name prefixed by "tasks." when # deployed inside an overlay network - AGENT_CLUSTER_ADDR: tasks.portainer_agent + AGENT_CLUSTER_ADDR: tasks.agent AGENT_SECRET: portainer_agent_secret_key_2024 AGENT_PORT: 9001 LOG_LEVEL: WARN + ports: + - 9001 volumes: - /var/run/docker.sock:/var/run/docker.sock - /var/lib/docker/volumes:/var/lib/docker/volumes @@ -44,16 +47,15 @@ services: - "traefik.enable=false" portainer: + container_name: service image: portainer/portainer-ee:lts - command: -H tcp://tasks.portainer_agent:9001 --tlsskipverify + command: -H tcp://tasks.agent:9001 --tlsskipverify ports: - "9443:9443" - "9000:9000" - "8000:8000" volumes: - portainer_data:/data - - /var/run/docker.sock:/var/run/docker.sock - - /:/host environment: AGENT_SECRET: portainer_agent_secret_key_2024 networks: @@ -80,12 +82,12 @@ services: networks: public: external: true - driver: overlay + attachable: true portainer_agent_network: external: true badge-net: + attachable: true external: true - driver: overlay volumes: portainer_data: \ No newline at end of file diff --git a/portainer-agent-stack.yml b/portainer-agent-stack.yml deleted file mode 100644 index e96369f..0000000 --- a/portainer-agent-stack.yml +++ /dev/null @@ -1,93 +0,0 @@ -version: '3.2' - -services: - traefik: - container_name: badge-traefik - image: "traefik:latest" - ports: - - "80:80" - - "443:443" - - "8080:8080" - networks: - - public - - badge-net - volumes: - - "/var/run/docker.sock:/var/run/docker.sock:ro" - - "./traefik:/data" - deploy: - mode: replicated - replicas: 1 - placement: - constraints: [node.hostname == little] - labels: - - "traefik.enable=false" - - agent: - container_name: portainer-agent - image: portainer/agent:lts - environment: - # REQUIRED: Should be equal to the service name prefixed by "tasks." when - # deployed inside an overlay network - AGENT_CLUSTER_ADDR: tasks.portainer_agent - AGENT_SECRET: portainer_agent_secret_key_2024 - AGENT_PORT: 9001 - LOG_LEVEL: WARN - ports: - - 9001 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - /var/lib/docker/volumes:/var/lib/docker/volumes - - /:/host - networks: - - portainer_agent_network - deploy: - mode: global - placement: - constraints: [node.platform.os == linux] - labels: - - "traefik.enable=false" - - portainer: - container_name: service - image: portainer/portainer-ee:lts - command: -H tcp://portainer_agent:9001 --tlsskipverify - ports: - - "9443:9443" - - "9000:9000" - - "8000:8000" - volumes: - - ./:/data - # - /var/run/docker.sock:/var/run/docker.sock - # - /:/host - environment: - AGENT_SECRET: portainer_agent_secret_key_2024 - networks: - - public - - portainer_agent_network - - badge-net - deploy: - mode: replicated - replicas: 1 - placement: - constraints: [node.role == manager] - labels: - - "traefik.enable=true" - - "traefik.http.routers.portainer.rule=Host(`dock.toy`)" - - "traefik.http.routers.portainer.entrypoints=web" - - "traefik.http.services.portainer.loadbalancer.server.port=9000" - - "traefik.http.routers.portainer.service=portainer" - # Edge - - "traefik.http.routers.edge.rule=Host(`edge.toy`)" - - "traefik.http.routers.edge.entrypoints=web" - - "traefik.http.services.edge.loadbalancer.server.port=8000" - - "traefik.http.routers.edge.service=edge" - -networks: - public: - external: true - attachable: true - portainer_agent_network: - external: true - badge-net: - attachable: true - external: true \ No newline at end of file diff --git a/traefik/traefik.yaml b/traefik/traefik.yaml index e18591d..e73243d 100644 --- a/traefik/traefik.yaml +++ b/traefik/traefik.yaml @@ -15,6 +15,8 @@ entryPoints: address: ":80" websecure: address: ":443" + traefik: + address: ":8080" providers: swarm: