Update dev env stuff

Author: NuckChorris

bin/address

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose run --rm --entrypoint bower client $@
+docker compose run --rm --entrypoint bower web $@

bin/admin/ban-user

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-docker-compose build
+docker compose build
 # Only create the database on development.
-# Schema and seed are bone by bin/seed
-docker-compose run --rm server rake db:create
-docker-compose run --rm server rake db:setup RAILS_ENV=test
+# Schema and seed are done by bin/seed
+docker compose run --rm api rake db:create
+docker compose run --rm api rake db:setup RAILS_ENV=test

bin/bower

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose run --rm --entrypoint ./bin/bundle server $@
+docker compose run --rm --entrypoint ./bin/bundle api $@

bin/build

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose run --rm --entrypoint rm server -rf "/opt/kitsu/server/public/system/*"
+docker compose run --rm --entrypoint rm api -rf "/opt/kitsu/server/public/system/*"

bin/bundle

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose run --rm client $@
+docker compose run --rm web $@

bin/clean-uploads

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose run --rm -e "RAILS_ENV=test" server guard $@
+docker compose run --rm -e "RAILS_ENV=test" api guard $@

bin/ember

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-containers="${@:-server client sidekiq}"
+containers="${@:-api web worker}"
 
-docker-compose logs $containers
+docker compose logs $containers

bin/guard

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose run --rm --entrypoint npm client $@
+docker compose run --rm --entrypoint npm web $@

bin/logs

@@ -2,7 +2,7 @@
 
 cd "$(dirname "$0")/../"
 
-url="http://$(./bin/address):$(./bin/port)/"
+url="http://kitsu.localhost:$(./bin/port)/"
 
 # Most common means of opening browsers on most systems.  We don't need 100%
 # success rate, just Good Enough™.

bin/npm

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose run --rm postgres sh -c "PGPASSWORD=\$POSTGRES_PASSWORD pg_dump --username=\$POSTGRES_USER --host=postgres $@"
+docker compose run --rm postgres sh -c "pg_dump --username=kitsu_development --host=postgres $@"

bin/open-browser

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose port router 80 | cut -d: -f2
+docker compose port router 80 | cut -d: -f2

bin/pg_dump

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose run --rm postgres sh -c "PGPASSWORD=\$POSTGRES_PASSWORD psql --username=\$POSTGRES_USER --host=postgres $@"
+docker compose run --rm postgres sh -c "psql --username=kitsu_development --host=postgres $@"

bin/port

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose run --rm --entrypoint ./bin/rails server $@
+docker compose run --rm --entrypoint ./bin/rails api $@

bin/psql

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose run --rm server rake $@
+docker compose run --rm api rake $@

bin/rails

@@ -4,7 +4,7 @@ cd "$(dirname "$0")/../"
 
 ./bin/check_for_updates
 
-docker-compose stop $@
-docker-compose rm -f $@
-docker-compose build $@
-docker-compose up -d $@
+docker compose stop $@
+docker compose rm -f $@
+docker compose build $@
+docker compose up -d $@

bin/rake

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose run --rm redis redis-cli -h redis -n 1 "$@"
+docker compose run --rm redis redis-cli -h redis -n 1 "$@"

bin/rebuild

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose run --rm -e "RAILS_ENV=test" --entrypoint ./bin/rspec server $@
+docker compose run --rm -e "RAILS_ENV=test" --entrypoint ./bin/rspec api $@

bin/redis-cli

@@ -2,7 +2,7 @@
 
 cd "$(dirname "$0")/../"
 
-docker-compose up -d $@
+docker compose up -d $@
 
-echo "Listening at http://$(./bin/address):$(./bin/port)/"
+echo "Listening at http://localhost:$(./bin/port)/"
 echo "Logs are available via \`bin/logs\`"

bin/rspec

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose ps
+docker compose ps

bin/start

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose stop $@
+docker compose stop $@

bin/status

@@ -19,4 +19,4 @@ function stop_listening {
 
 trap stop_listening EXIT
 
-docker-compose run --rm --publish=7357:7357 client test --server
+docker compose run --rm --publish=7357:7357 client test --server

bin/stop

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker compose run --rm --entrypoint yarn client $@

bin/testem

@@ -1,4 +1,4 @@
-version: '2'
+version: "3.8"
 
 volumes:
   postgres:
@@ -9,65 +9,64 @@ volumes:
     driver: local
 
 services:
-  # Database servers
+  # Databases
   postgres:
-    image: postgres:9.4
+    image: postgres:11
     environment:
       PGDATA: /var/lib/postgresql/data/pgdata
-      POSTGRES_PASSWORD: mysecretpassword
-      POSTGRES_USER: postgres
+      POSTGRES_USER: kitsu_development
+      POSTGRES_HOST_AUTH_METHOD: trust
     volumes:
       - postgres:/var/lib/postgresql/data
-    ports: ['5432:5432']
+    ports: [5432]
   redis:
     image: redis
   elasticsearch:
     image: elasticsearch:2
 
-  # Mailcatcher
+  # Pretend cloud services
   mailcatcher:
     image: schickling/mailcatcher
-    ports: [1080]
+  minio:
+    image: minio/minio:latest
+    command: [server, "/data"]
+    volumes:
+      - ./uploads:/data
 
   # Web server, routing /api and / to server, client respectively
   router:
     build: ./router
-    links: [client, server]
+    depends_on: [web, api, minio, mailcatcher]
     volumes:
       - uploads:/srv/www/uploads/system
-    ports: [80]
+    ports: ["42069:80"]
 
-  # Rails server
-  server: &rails
-    links: [postgres, redis, elasticsearch, mailcatcher]
-    build: ./server
+  # Application
+  api: &rails
+    depends_on: [postgres, redis, elasticsearch, mailcatcher, minio]
+    build:
+      context: ./server
+      dockerfile: Dockerfile.local
     volumes:
       - ./server:/opt/kitsu/server
       - uploads:/opt/kitsu/server/public/system
       # Cache bundle
       - /usr/local/bundle
     environment:
-      DATABASE_URL: 'postgresql://postgres:mysecretpassword@postgres/'
-      REDIS_URL: 'redis://redis/1'
+      DATABASE_URL: "postgresql://kitsu_development@postgres/"
+      ELASTICSEARCH_URL: "elasticsearch:9200"
+      REDIS_URL: "redis://redis/1"
       RAILS_ENV: development
-      SMTP_ADDRESS: 'mailcatcher'
-      SMTP_PORT: '1025'
-
-  # Sidekiq
-  sidekiq:
+      SMTP_ADDRESS: "mailcatcher"
+      SMTP_PORT: "1025"
+  worker:
     <<: *rails
     command: [sidekiq]
-
-  # Ember server
-  client:
+  web:
     build: ./client
     volumes:
       - ./client:/opt/kitsu/client
-      - /root/.cache/yarn
-      - /opt/kitsu/client/node_modules
-      - /opt/kitsu/client/bower_components
     tmpfs:
       - /opt/kitsu/client/tmp
     environment:
       EMBER_ENV: development
-    ports: ['57777:57777']

bin/yarn

@@ -3,3 +3,4 @@ MAINTAINER Kitsu, Inc.
 
 RUN rm /etc/nginx/conf.d/default.conf
 COPY ./nginx.conf /etc/nginx/conf.d/kitsu.conf
+COPY ./*.include.conf /etc/nginx/

docker-compose.yml

@@ -0,0 +1,4 @@
+# Extreme Logging
+error_log stderr debug;
+rewrite_log on;
+log_subrequest on;

router/Dockerfile

@@ -1,61 +1,44 @@
+# The $upstream nonsense is to force runtime (instead of boot-time) DNS resolution so that
+# Docker containers can be swapped without restarting nginx
 server {
-    listen 80;
-
-    # Extreme Logging
-    error_log stderr debug;
-    rewrite_log on;
-    log_subrequest on;
-
-    # Proxy settings
-    resolver 127.0.0.11;
-    proxy_redirect off;
-    proxy_set_header Host $http_host;
-    proxy_set_header X-Real_IP $remote_addr;
-    proxy_set_header X-Forwarded_For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto $scheme;
-
-    # File serving
-    sendfile on;
-    include /etc/nginx/mime.types;
-
-    # This nonsense is to force runtime (instead of boot-time) resolution of DNS
-    # so that Docker containers can be swapped, while being functionally
-    # equivalent to the following block:
-    #
-    #     location /api/ {
-    #         proxy_pass http://server/;
-    #     }
-    #
-    # It rewrites the path, stripping the prefix of the location block, so that
-    # Rails doesn't have to be completely aware that it's nested under /api/.
-    location ~* /api/(?<path>.*$) {
-        set $upstream "http://server/api/";
-        proxy_pass $upstream$path$is_args$args;
-    }
-    location ~* /api/system/(?<path>.*$) {
-        set $upstream "http://server/";
-        proxy_pass $upstream$path$is_args$args;
-        client_max_body_size 10M;
-    }
-    location ~* /rails/(?<path>.*$) {
-        set $upstream "http://server/rails/";
-        proxy_pass $upstream$path$is_args$args;
-    }
-    location ~* /forest(?<path>.*$) {
-        set $upstream "http://server/api/forest/";
-        proxy_pass $upstream$path$is_args$args;
-    }
-    location ~* /(?<path>.*$) {
-        set $upstream "http://client/";
-        proxy_pass $upstream$path$is_args$args;
-    }
-    location ^~ /system/ {
-        root /srv/www/uploads/;
-        try_files $uri @media;
-    }
-    location @media {
-        rewrite ^/system(/.*)$ $1 break;
-        proxy_set_header Host 'media.kitsu.io';
-        proxy_pass https://media.kitsu.io;
-    }
+  listen 80 default_server;
+  server_name kitsu.localhost;
+
+  include proxy.include.conf;
+  include logging.include.conf;
+
+  location /api/ {
+    set $upstream "http://api";
+    proxy_pass $upstream;
+  }
+  location / {
+    set $upstream "http://web";
+    proxy_pass $upstream;
+  }
+}
+
+server {
+  listen 80;
+  server_name media.kitsu.localhost;
+
+  include proxy.include.conf;
+  include logging.include.conf;
+
+  location / {
+    set $upstream "http://minio:9000";
+    proxy_pass $upstream;
+  }
+}
+
+server {
+  listen 80;
+  server_name mail.kitsu.localhost;
+
+  include proxy.include.conf;
+  include logging.include.conf;
+
+  location / {
+    set $upstream "http://mailcatcher:1080";
+    proxy_pass $upstream;
+  }
 }

router/logging.include.conf

@@ -0,0 +1,7 @@
+# Proxy settings
+resolver 127.0.0.11;
+proxy_redirect off;
+proxy_set_header Host $http_host;
+proxy_set_header X-Real_IP $remote_addr;
+proxy_set_header X-Forwarded_For $proxy_add_x_forwarded_for;
+proxy_set_header X-Forwarded-Proto $scheme;