From fe1a7b6dee3c30c19bc604489ca85646b2c1f06d Mon Sep 17 00:00:00 2001 From: Simon Milvert Date: Thu, 20 Feb 2020 20:31:24 +0100 Subject: [PATCH 1/5] Added postgres and a simple wordpress --- wordpress/docker-compose.yml | 101 +++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 wordpress/docker-compose.yml diff --git a/wordpress/docker-compose.yml b/wordpress/docker-compose.yml new file mode 100644 index 0000000..3d72706 --- /dev/null +++ b/wordpress/docker-compose.yml @@ -0,0 +1,101 @@ +version: '3' + +services: + mariadb: + container_name: mariadb + image: mariadb:10.4 + networks: + - backend + restart: always + volumes: + - ${DIR}/mariadb:/var/lib/mysql + environment: + - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=wordpress + + phpmyadmin: + image: phpmyadmin/phpmyadmin:latest + networks: + - backend + - frontend + ports: + - 8000:80 + environment: + - PMA_ARBITRARY=1 + - PMA_HOST=mariadb + + postgres: + container_name: postgres + image: postgres + restart: always + networks: + - backend + environment: + - TZ=${TZ} + - POSTGRES_USER=${POSTGRES_USER} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + volumes: + - ${DIR}/postgres/data:/var/lib/postgresql/data + - ${DIR}/shared:/shared + + pgadmin4: + container_name: pgadmin4 + image: dpage/pgadmin4 + restart: always + ports: + - "8003:80" + networks: + - backend + environment: + - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL} + - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD} + #- PUID=${PUID} + #- PGID=${PGID} + #- TZ=${TZ} + volumes: + - ${DIR}/pgadmin4:/root/.pgadmin + #- ${DIR}/pgadmin4:/var/lib/pgadmin + + + wordpress: + image: wordpress + environment: + - WORDPRESS_DB_PASSWORD=${MYSQL_PASSWORD} + networks: + - backend + - frontend + ports: + - 8002:80 + volumes: + - ${DIR}/wp:/var/www/html + links: + - mariadb:mysql + + ttrss: + image: wangqiru/ttrss:latest + container_name: ttrss + ports: + - 8001:80 + environment: + - SELF_URL_PATH=http://localhost:8001/ # please change to your own domain + - DB_HOST=POSTGRES + - DB_PORT=5432 + - DB_NAME=ttrss + - DB_USER=root + - DB_PASS=qwerty # please change the password + - ENABLE_PLUGINS=auth_internal,fever # auth_internal is required. Plugins enabled here will be enabled for all users as system plugins + stdin_open: true + tty: true + restart: always + command: sh -c 'sh /wait-for.sh $$DB_HOST:$$DB_PORT -- php /configure-db.php && exec s6-svscan /etc/s6/' + + networks: + - backend + - frontend + +networks: + frontend: + external: true + backend: + external: false + From ea591ac948ad60851104a912a907a0d00aca050d Mon Sep 17 00:00:00 2001 From: Simon Milvert Date: Thu, 20 Feb 2020 21:26:29 +0100 Subject: [PATCH 2/5] Added variabels in env --- .env | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.env b/.env index a79f434..e9de253 100644 --- a/.env +++ b/.env @@ -1,2 +1,14 @@ -DIR=/srv/docker -DOMAIN=milvert.com +DIR=/home/simon/docker/data +DOMAIN=localhost + + +MYSQL_USERNAME=root +MYSQL_PASSWORD=qwerty + +POSTGRES_USER=root +POSTGRES_PASSWORD=qwerty +PGADMIN_DEFAULT_EMAIL=kalle@asd.com +PGADMIN_DEFAULT_PASSWORD=bajsa + +PUID=1000 +PGID=1000 From d635990b6229938bc5afa0f64a4c52378105a65f Mon Sep 17 00:00:00 2001 From: Simon Milvert Date: Sun, 24 May 2020 20:15:09 +0200 Subject: [PATCH 3/5] Working wordpress site --- .env | 1 + wordpress/docker-compose.yml | 60 +----------------------------------- 2 files changed, 2 insertions(+), 59 deletions(-) diff --git a/.env b/.env index e9de253..2fc998a 100644 --- a/.env +++ b/.env @@ -12,3 +12,4 @@ PGADMIN_DEFAULT_PASSWORD=bajsa PUID=1000 PGID=1000 +TZ=Europe/Stockholm diff --git a/wordpress/docker-compose.yml b/wordpress/docker-compose.yml index 3d72706..bf14ac0 100644 --- a/wordpress/docker-compose.yml +++ b/wordpress/docker-compose.yml @@ -1,29 +1,6 @@ version: '3' services: - mariadb: - container_name: mariadb - image: mariadb:10.4 - networks: - - backend - restart: always - volumes: - - ${DIR}/mariadb:/var/lib/mysql - environment: - - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD} - - MYSQL_DATABASE=wordpress - - phpmyadmin: - image: phpmyadmin/phpmyadmin:latest - networks: - - backend - - frontend - ports: - - 8000:80 - environment: - - PMA_ARBITRARY=1 - - PMA_HOST=mariadb - postgres: container_name: postgres image: postgres @@ -51,47 +28,12 @@ services: - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD} #- PUID=${PUID} #- PGID=${PGID} - #- TZ=${TZ} + - TZ=${TZ} volumes: - ${DIR}/pgadmin4:/root/.pgadmin #- ${DIR}/pgadmin4:/var/lib/pgadmin - wordpress: - image: wordpress - environment: - - WORDPRESS_DB_PASSWORD=${MYSQL_PASSWORD} - networks: - - backend - - frontend - ports: - - 8002:80 - volumes: - - ${DIR}/wp:/var/www/html - links: - - mariadb:mysql - - ttrss: - image: wangqiru/ttrss:latest - container_name: ttrss - ports: - - 8001:80 - environment: - - SELF_URL_PATH=http://localhost:8001/ # please change to your own domain - - DB_HOST=POSTGRES - - DB_PORT=5432 - - DB_NAME=ttrss - - DB_USER=root - - DB_PASS=qwerty # please change the password - - ENABLE_PLUGINS=auth_internal,fever # auth_internal is required. Plugins enabled here will be enabled for all users as system plugins - stdin_open: true - tty: true - restart: always - command: sh -c 'sh /wait-for.sh $$DB_HOST:$$DB_PORT -- php /configure-db.php && exec s6-svscan /etc/s6/' - - networks: - - backend - - frontend networks: frontend: From af6fcb5a9c4610c3af963f99a45ca9dbc682ba20 Mon Sep 17 00:00:00 2001 From: Simon Milvert Date: Sun, 24 May 2020 20:19:35 +0200 Subject: [PATCH 4/5] Added draaft of nextcloud --- nextcloud/.env | 1 + nextcloud/docker-compose.yml | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 120000 nextcloud/.env create mode 100644 nextcloud/docker-compose.yml diff --git a/nextcloud/.env b/nextcloud/.env new file mode 120000 index 0000000..4a82335 --- /dev/null +++ b/nextcloud/.env @@ -0,0 +1 @@ +../.env \ No newline at end of file diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml new file mode 100644 index 0000000..84042e0 --- /dev/null +++ b/nextcloud/docker-compose.yml @@ -0,0 +1,26 @@ +version: '3' + +services: + + nextcloud: + image: linuxserver/nextcloud + container_name: nextcloud + environment: + - PUID=1000 + - PGID=1000 + - TZ=${TZ} + volumes: + - ${DIR}/nextcloud/config:/config + - ${DIR}/data:/data + networks: + - backend + ports: + - 443:443 + restart: unless-stopped + +networks: + frontend: + external: true + backend: + external: false + From 12c6ce8f9a47c113f8b0b274991cd5632d15d161 Mon Sep 17 00:00:00 2001 From: Simon Milvert Date: Sun, 24 May 2020 22:42:30 +0200 Subject: [PATCH 5/5] first draft of influx 2 --- data_handling/docker-compose.yml | 57 ++++++++++++++++++++++++++++++++ data_handling/telegraf.conf | 35 ++++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 data_handling/docker-compose.yml create mode 100644 data_handling/telegraf.conf diff --git a/data_handling/docker-compose.yml b/data_handling/docker-compose.yml new file mode 100644 index 0000000..3233c60 --- /dev/null +++ b/data_handling/docker-compose.yml @@ -0,0 +1,57 @@ + +version: '3' + +services: + grafana: + image: grafana/grafana + container_name: grafana + networks: + - backend + volumes: + # Data persistency + # sudo mkdir -p /srv/docker/grafana/data; chown 472:472 /srv/docker/grafana/data + - "${DIR}/grafana:/var/lib/grafana" + labels: + - "traefik.enable=true" + - "traefik.http.routers.grafana.rule=Host(`grafana.${DOMAIN}`)" + - "traefik.http.routers.grafana.entrypoints=web" + - "traefik.http.services.grafana-service.loadbalancer.server.port=3000" + + influx: + image: quay.io/influxdb/influxdb:2.0.0-beta + container_name: influxdb + networks: + - backend + ports: + - 9999:9999 + labels: + - "traefik.http.routers.influx.entryPoints=port8086" + - "traefik.http.routers.influx.rule=host(`influx.${DOMAIN}`)" + - "traefik.http.services.influx-service.loadBalancer.server.port=8086" + restart: always + environment: + - INFLUX_TOKEN=-I2TAAlmXdJ06yMw9wf-Mztf83ZzYZUdE8Ov2hMrnYabvXUnxL2cZfDzNHR6LTbW7ND5rE95CdvV2-Cy8IMHZQ== + + telegraf: + container_name: telegraf + image: 'telegraf' + restart: always + networks: + - backend + ports: + - 8081:8081 + environment: + - INFLUX_TOKEN=-I2TAAlmXdJ06yMw9wf-Mztf83ZzYZUdE8Ov2hMrnYabvXUnxL2cZfDzNHR6LTbW7ND5rE95CdvV2-Cy8IMHZQ== + volumes: + - ./telegraf.conf:/etc/telegraf/telegraf.conf + - /var/run/docker.sock:/var/run/docker.sock + + + + +networks: + frontend: + external: true + backend: + external: false + diff --git a/data_handling/telegraf.conf b/data_handling/telegraf.conf new file mode 100644 index 0000000..3a97f03 --- /dev/null +++ b/data_handling/telegraf.conf @@ -0,0 +1,35 @@ +[agent] + interval = "5s" + round_interval = true + metric_batch_size = 1000 + metric_buffer_limit = 10000 + collection_jitter = "0s" + flush_interval = "5s" + flush_jitter = "0s" + precision = "" + debug = false + quiet = false + logfile = "" + hostname = "$HOSTNAME" + omit_hostname = false + +[[inputs.docker]] + endpoint = "unix:///var/run/docker.sock" + +[[outputs.influxdb_v2]] + urls = ["http://influxdb:9999"] + organization = "milvert" + bucket = "home" + token = "-I2TAAlmXdJ06yMw9wf-Mztf83ZzYZUdE8Ov2hMrnYabvXUnxL2cZfDzNHR6LTbW7ND5rE95CdvV2-Cy8IMHZQ" + +[[inputs.http_listener_v2]] + ## Address and port to host HTTP listener on + service_address = ":8081" + + ## Path to listen to. + path = "/write" + + ## HTTP methods to accept. + methods = ["POST", "PUT"] + + data_format = "influx"