Merge pull request #350 from Trim/docker-avatar-mysql

Docker improve mysql and image services

Author: Trim

Docker.md

@@ -5,14 +5,10 @@ To simplify set up of a developement environment, LinuxFr.org can be
 run on Docker with `docker-compose up`.
 
 To init the SQL database schema, you need to wait upto the `database`
-and `database-test` containers are ready to listen MySQL connections.
+container to be ready to listen MySQL connections.
 
 For example, you should see in the logs:
 
-> database-test_1  | 2020-09-21 16:03:12 140126029907968 [Note] mysqld: ready for connections.
->
-> database-test_1  | Version: '10.1.46-MariaDB-1\~bionic'  socket: '/var/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution
->
 > database_1       | 2020-09-21 16:03:12 139820938893312 [Note] mysqld: ready for connections.
 >
 > database_1       | Version: '10.1.46-MariaDB-1\~bionic'  socket: '/var/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution

INSTALL.md

@@ -176,12 +176,24 @@ server {
 
     listen 0.0.0.0:80;
 
-    location ~ ^/(avatars|medias)/ {
+    location ~ ^/medias/ {
       root /home/linuxfr/linuxfr.org/uploads;
     }
 
-    # To install the LinuxFr img service, see: https://github.com/linuxfrorg/img-LinuxFr.org
+    # Avatars files uploaded on linuxfr server are stored in partitions
+    # with folder name containing 3 digits
+    location ~ ^/avatars/\d\d\d/ { 
+      root /home/linuxfr/linuxfr.org/uploads;
+    }
+
+    # Avatars URLs has to be served by the image service
+    location ~ ^/avatars/ {
+        # To install the LinuxFr img service, see: https://github.com/linuxfrorg/img-LinuxFr.org
+        proxy_pass http://localhost:8000;
+    }
+
     location /img/ {
+        # To install the LinuxFr img service, see: https://github.com/linuxfrorg/img-LinuxFr.org
         proxy_pass http://localhost:8000;
     }
 

deployment/database-test/entrypoint.sh

@@ -0,0 +1,3 @@
+FROM mariadb:10.1
+
+COPY ./docker-entrypoint-initdb.d /docker-entrypoint-initdb.d

deployment/database/Dockerfile

@@ -0,0 +1,10 @@
+#/usr/bin/env sh
+
+set -euo pipefail
+
+mysql -uroot -hlocalhost -p"${MYSQL_ROOT_PASSWORD}" <<EOSQL
+  CREATE USER IF NOT EXISTS '${MYSQL_TEST_USER}'@'%' IDENTIFIED BY '${MYSQL_TEST_PASSWORD}';
+  CREATE DATABASE IF NOT EXISTS ${MYSQL_TEST_DATABASE};
+  GRANT ALL PRIVILEGES ON ${MYSQL_TEST_DATABASE}.* TO '${MYSQL_TEST_USER}'@'%';
+EOSQL
+

deployment/database/docker-entrypoint-initdb.d/001-create-database-test.sh

@@ -8,8 +8,8 @@ REDIS_HOST=redis
 REDIS_PORT=6379
 REDIS_URL=redis://redis:6379/0
 
-# For the mariadb docker image configuration, see: https://hub.docker.com/_/mariadb
-MYSQL_RANDOM_ROOT_PASSWORD=true
+# Fixed mysql root user password to be able to run entrypoint
+MYSQL_ROOT_PASSWORD=linuxfr_root_pwd
 
 # Developement environment
 MYSQL_HOST=database
@@ -21,7 +21,6 @@ MYSQL_PASSWORD=linuxfr_rails
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
-MYSQL_TEST_HOST=database-test
 MYSQL_TEST_DATABASE=linuxfr_test
 MYSQL_TEST_USER=linuxfr_test
 MYSQL_TEST_PASSWORD=linuxfr_test

deployment/default.env

@@ -14,7 +14,7 @@ development:
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  host: <%= ENV['MYSQL_TEST_HOST'] %>
+  host: <%= ENV['MYSQL_HOST'] %>
   database: <%= ENV['MYSQL_TEST_DATABASE'] %>
   username: <%= ENV['MYSQL_TEST_USER'] %>
   password: <%= ENV['MYSQL_TEST_PASSWORD'] %>

deployment/linuxfr.org/database.yml

@@ -4,10 +4,17 @@ server {
 
   server_name ${IMAGE_DOMAIN};
 
-  location ~ ^/(avatars|medias)/ { 
+  location ~ ^/medias/ { 
     root /var/linuxfr/uploads;
   }
 
+  # Avatars files uploaded on linuxfr server are stored in partitions
+  # with folder name containing 3 digits
+  location ~ ^/avatars/\d\d\d/ { 
+    root /var/linuxfr/uploads;
+  }
+
+  # All other images (avatars URLs and /img) pass by the image service
   location / {
     proxy_pass http://linuxfr-img:8000;
   }

deployment/nginx/templates/image.dlfp.conf.template

@@ -20,7 +20,6 @@ services:
       - /linuxfr.org/public/tmp:size=100M
     depends_on:
       - database
-      - database-test
       - redis
 
   linuxfr-board:
@@ -57,24 +56,16 @@ services:
       - linuxfr-img
 
   database:
-    image: mariadb:10.1
+    build:
+      context: deployment/database
     env_file:
       - deployment/default.env
     restart: unless-stopped
+    ports:
+      - "3306:3306"
     volumes:
       - data-database:/var/lib/mysql
 
-  database-test:
-    image: mariadb:10.1
-    env_file:
-      - deployment/default.env
-    entrypoint: ["/linuxfr-entrypoint.sh"]
-    command: ["mysqld"]
-    restart: unless-stopped
-    volumes:
-      - data-database-test:/var/lib/mysql
-      - ./deployment/database-test/entrypoint.sh:/linuxfr-entrypoint.sh
-
   redis:
     image: redis:5
     restart: unless-stopped
@@ -84,8 +75,6 @@ services:
 volumes:
   data-database:
     driver: local
-  data-database-test:
-    driver: local
   data-redis:
     driver: local
   data-uploads: