Browse Source

Move docker user $HOME

pull/3807/head
nanaya 7 months ago
parent
commit
449e23d85e
2 changed files with 6 additions and 3 deletions
  1. 2
    0
      .docker/.gitignore
  2. 4
    3
      docker-compose.yml

+ 2
- 0
.docker/.gitignore View File

@@ -0,0 +1,2 @@
1
+*
2
+!.gitignore

+ 4
- 3
docker-compose.yml View File

@@ -2,12 +2,12 @@ version: '3.4'
2 2
 
3 3
 x-env: &x-env
4 4
   CACHE_DRIVER: redis
5
-  COMPOSER_HOME: /data/osuweb/.composer
5
+  COMPOSER_HOME: /data/osuweb/.docker/.composer
6 6
   DB_HOST: db
7 7
   ES_HOST: elasticsearch:9200
8
-  HOME: /data/osuweb
8
+  HOME: /data/osuweb/.docker
9 9
   REDIS_HOST: redis
10
-  YARN_CACHE_FOLDER: /data/osuweb/.yarn
10
+  YARN_CACHE_FOLDER: /data/osuweb/.docker/.yarn
11 11
 
12 12
 services:
13 13
   nginx:
@@ -26,6 +26,7 @@ services:
26 26
       - ./bin/db_setup.sh:/docker-entrypoint-initdb.d/db_setup.sh
27 27
       - ./docker/mysql/db_user.sql:/docker-entrypoint-initdb.d/db_user.sql
28 28
     environment:
29
+      <<: *x-env
29 30
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
30 31
       MYSQL_ONETIME_PASSWORD: "yes"
31 32
   redis:

Loading…
Cancel
Save