Merge branch '26-collision-on-image-name-in-docker-compose-yml' into …

…'master' Resolve "collision on image name in docker-compose.yml" Closes #26 See merge request research-and-development/pwn-machine!11
SakiiR · Jul 19, 2021 · 2106caa · 2106caa
2 parents eb15872 + 446a4dc
commit 2106caa
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -59,7 +59,6 @@ services:
 
  traefik:
  container_name: pm_traefik
- image: traefik
  build:
  context: ./dockers/traefik
  args:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -59,7 +59,6 @@ services:
 
  traefik:
  container_name: pm_traefik
- image: traefik
  build:
  context: ./dockers/traefik
  args:
@@ -108,7 +107,7 @@ services:
 ##
  manager:
  container_name: pm_manager
- image: "pm_manager"
+ image: "pm-manager"
  build:
  context: ./dockers/manager
  depends_on: