From 8a8e9c0c5016ce21e4e88e77983023d33b0d5ca4 Mon Sep 17 00:00:00 2001 From: Till Witt Date: Thu, 12 Jul 2018 15:31:12 +0200 Subject: [PATCH 1/3] adding MariaDB and phpMyAdmin, adding docker-compose adding MariaDB and phpMyAdmin, adding docker-compose for easier build & run --- .gitignore | 5 ++++- Dockerfile | 2 +- docker-compose.yml | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 docker-compose.yml diff --git a/.gitignore b/.gitignore index 43d3c5c..1db9d73 100644 --- a/.gitignore +++ b/.gitignore @@ -96,4 +96,7 @@ ENV/ .ropeproject # Not my config file -nilsbot.json \ No newline at end of file +nilsbot.json + +# data directory for docker +dockerdata/ diff --git a/Dockerfile b/Dockerfile index 29857c7..c13a681 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM debian:buster-slim -LABEL maintainer="Till Witt "" +LABEL maintainer="Till Witt " RUN apt-get update && \ apt-get -y install python2.7 python-pip libmariadbclient-dev && \ diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..20af3a6 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,32 @@ +#docker exec -it mindchains_enodeserver /bin/bash + +version: '3.1' +services: + server: + build: . + container_name: pyTweetbot + stdin_open: true + links: + - db + + db: + image: mariadb + environment: + - MYSQL_ROOT_PASSWORD=pytb + - MYSQL_DATABASE=pytb + volumes: + - ./dockerdata/database:/var/lib/mysql + + + phpmyadmin: + image: phpmyadmin/phpmyadmin + container_name: phpmyadmin + environment: + - PMA_HOST=db + restart: always + ports: + - 80:80 + volumes: + - /sessions + links: + - db From f4e62006870c839df078583cb30655e6d2cc0b5e Mon Sep 17 00:00:00 2001 From: Till Witt Date: Thu, 12 Jul 2018 15:50:19 +0200 Subject: [PATCH 2/3] fixing container names --- docker-compose.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 20af3a6..547ca40 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,9 +2,9 @@ version: '3.1' services: - server: + pytweetbot: build: . - container_name: pyTweetbot + container_name: pytweetbot stdin_open: true links: - db @@ -20,7 +20,6 @@ services: phpmyadmin: image: phpmyadmin/phpmyadmin - container_name: phpmyadmin environment: - PMA_HOST=db restart: always From 7c3b9c0fdf12d9f389b4d67680ade934aad262a2 Mon Sep 17 00:00:00 2001 From: Till Witt Date: Fri, 13 Jul 2018 09:31:37 +0200 Subject: [PATCH 3/3] bot now working --- Dockerfile | 3 ++- docker-compose.yml | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c13a681..5cbefff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM debian:buster-slim +#FROM debian:buster-slim +FROM ubuntu:17.10 LABEL maintainer="Till Witt " diff --git a/docker-compose.yml b/docker-compose.yml index 547ca40..1b16901 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,8 @@ services: build: . container_name: pytweetbot stdin_open: true + volumes: + - .:/app links: - db