From 26e2ff3d870c7380e42696ff4d34743aad3cfc15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=A9o=20Ha=C3=BFs?= <me@haysberg.io>
Date: Fri, 25 Feb 2022 10:19:06 +0100
Subject: [PATCH] Fixed container name conflict. Remove args.yml

---
 args.yaml                              | 94 --------------------------
 setup_files/gateway/docker-compose.yml |  4 +-
 2 files changed, 2 insertions(+), 96 deletions(-)
 delete mode 100644 args.yaml

diff --git a/args.yaml b/args.yaml
deleted file mode 100644
index e1161f9..0000000
--- a/args.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-name: baleine
-author: Téo Haÿs <teo.hays@inria.fr>
-about: "Deploys Docker containers using Rhubarbe. \nPlease create issues and read the wiki here : \nhttps://github.com/haysberg/baleine"
-settings :
-    - ArgRequiredElseHelp
-    - InferSubcommands
-    - DeriveDisplayOrder
-    - DontCollapseArgsInUsage
-subcommands:
-    - deploy:
-        settings:
-            - AllowLeadingHyphen
-            - TrailingVarArg
-        about: deploys the selected container on nodes
-        usage: baleine deploy [FLAGS] [OPTIONS] [--nodes "<nodes>"] --image <image> [--command <command>]
-        args:
-            - image:
-                short: i
-                long: image
-                value_name: image
-                takes_value: true
-                required: true
-                help: the image to deploy, <repository>/image:tag format
-            - options:
-                short: o
-                long: options
-                takes_value: true
-                multiple: true
-                help: the options string that you want to send to the container.
-            - nodes:
-                short: n
-                long: nodes
-                takes_value: true
-                help: nodes you want to deploy the container on
-            - bypass-check:
-                short: B
-                long: bypass-check
-                help: bypass the check to see if the nodes are running the required Docker-ready image
-            - bootstrap:
-                long: bootstrap
-                help: deploys the latest baleine compatible image on the machine before deploying the container
-                short: b
-                conflicts_with: ndz
-            - ndz:
-                long: ndz
-                help: choose a .ndz image to be deployed before the container
-                conflicts_with: bootstrap
-                takes_value: true
-            - command:
-                long: command
-                help: Use this option to choose what command to pass to the container. ALWAYS USE LAST.
-                takes_value: true
-                multiple: true
-
-    - destroy:
-        about: destroys containers or images PERMANENTLY
-        args:
-            - yes:
-                short: y
-                long: yes
-                help: doesn't ask if you really want to destroy the container
-            - image:
-                short: i
-                long: image
-                value_name: image
-                takes_value: true
-                help: the image to destroy PERMANENTLY
-            - nodes:
-                short: n
-                long: nodes
-                takes_value: true
-                help: nodes you want to destroy
-    - list:
-        about: lists the CUSTOM images to deploy. Images on Dockerhub are NOT listed
-        args:
-            - details:
-                long: details
-                short: d
-                takes_value: true
-                help: name of the image for which you want to display all the different versions available
-    - save:
-        about: saves the selected container as an image for future use
-        args: 
-            - name:
-                long: name
-                takes_value: true
-                required: true
-                help: name of the image you wish to create
-            - node: 
-                long: node
-                short: n
-                takes_value: true
-                required: true
-                help: identifier of the node you want to save
\ No newline at end of file
diff --git a/setup_files/gateway/docker-compose.yml b/setup_files/gateway/docker-compose.yml
index 1d388e6..af8b2f8 100644
--- a/setup_files/gateway/docker-compose.yml
+++ b/setup_files/gateway/docker-compose.yml
@@ -7,7 +7,7 @@ services:
   docker-proxy:
     pull_policy: always
     image: registry:latest
-    container_name: registry
+    container_name: docker-proxy
     restart: always
     ports:
       - 0.0.0.0:81:5000 #To listen on port 443, change it to 443:5000
@@ -17,7 +17,7 @@ services:
   docker-repo:
     pull_policy: always
     image: registry:latest
-    container_name: registry
+    container_name: docker-repo
     restart: always
     ports:
       - 0.0.0.0:80:5000 #To listen on port 443, change it to 443:5000
\ No newline at end of file