From 4b08a7f01702747ce1a235596193821b957d3b53 Mon Sep 17 00:00:00 2001
From: Martin <martin.gobert@adeo.com>
Date: Tue, 5 Oct 2021 19:25:42 +0200
Subject: [PATCH] fix bug

---
 0_run/commands.sh              |  7 ++++++-
 1_dockerfile/bash/Dockerfile   |  4 ++++
 1_dockerfile/curl/Dockerfile   |  8 ++++++++
 1_dockerfile/python/Dockerfile | 12 ++++++++++++
 2_compose/convos/settings.json |  1 +
 2_compose/docker-compose.yml   | 10 ++++++++++
 6 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 2_compose/convos/settings.json

diff --git a/0_run/commands.sh b/0_run/commands.sh
index cc1f786..e318c78 100644
--- a/0_run/commands.sh
+++ b/0_run/commands.sh
@@ -1 +1,6 @@
-#!/bin/bash
\ No newline at end of file
+#!/bin/bash
+docker run --rm docker/whalesay cowsay "Hello M1 III 2021"
+docker container run -it --rm python:3 python
+
+
+
diff --git a/1_dockerfile/bash/Dockerfile b/1_dockerfile/bash/Dockerfile
index e69de29..018f809 100644
--- a/1_dockerfile/bash/Dockerfile
+++ b/1_dockerfile/bash/Dockerfile
@@ -0,0 +1,4 @@
+FROM ubuntu:18.04
+
+COPY to_run.sh app/to_run.sh
+CMD app/to_run.sh
diff --git a/1_dockerfile/curl/Dockerfile b/1_dockerfile/curl/Dockerfile
index e69de29..b261b63 100644
--- a/1_dockerfile/curl/Dockerfile
+++ b/1_dockerfile/curl/Dockerfile
@@ -0,0 +1,8 @@
+FROM ubuntu:16.04
+
+# Install prerequisites
+RUN apt-get update && apt-get install -y \
+curl
+ENTRYPOINT ["curl", "$arg1"]
+
+
diff --git a/1_dockerfile/python/Dockerfile b/1_dockerfile/python/Dockerfile
index e69de29..cbbb332 100644
--- a/1_dockerfile/python/Dockerfile
+++ b/1_dockerfile/python/Dockerfile
@@ -0,0 +1,12 @@
+FROM python:2.7
+
+COPY app.py requirements.txt app/
+
+WORKDIR /app
+
+RUN pip install -r requirements.txt
+
+EXPOSE 5000
+
+CMD ["python", "app.py"]
+
diff --git a/2_compose/convos/settings.json b/2_compose/convos/settings.json
new file mode 100644
index 0000000..9619978
--- /dev/null
+++ b/2_compose/convos/settings.json
@@ -0,0 +1 @@
+{"contact":"mailto:root@localhost","default_connection":"irc:\/\/chat.freenode.net:6697\/%23convos","forced_connection":false,"local_secret":"ae0af0ca954a6cbdab21140bc8ee9fd4ed61da2e","open_to_public":false,"organization_name":"Convos","organization_url":"https:\/\/convos.chat","session_secrets":["b0380806bb44f207e29df921f20c91ad7ffd4afe"]}
\ No newline at end of file
diff --git a/2_compose/docker-compose.yml b/2_compose/docker-compose.yml
index e69de29..1cf69a9 100644
--- a/2_compose/docker-compose.yml
+++ b/2_compose/docker-compose.yml
@@ -0,0 +1,10 @@
+version: '3'
+services:
+  convos:
+    image: nordaaker/convos:release-4.33
+    container_name: convos
+    ports:
+      - 2021:3000
+    volumes:
+      - ./convos:/data
+