From d635990b6229938bc5afa0f64a4c52378105a65f Mon Sep 17 00:00:00 2001
From: Simon Milvert <simon@milvert.com>
Date: Sun, 24 May 2020 20:15:09 +0200
Subject: [PATCH] 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: