diff --git a/.docker-compose.yml.swp b/.docker-compose.yml.swp deleted file mode 100644 index 28fa027..0000000 Binary files a/.docker-compose.yml.swp and /dev/null differ diff --git a/docker-compose.yml b/docker-compose.yml index 2aff381..580bd74 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,85 +1,68 @@ version: "2" services: web: - image: registry.cn-hangzhou.aliyuncs.com/fecshopsoft/nginx - ports: + image: nginx + ports: - "88:80" restart: always volumes: - - ./app:/www/web - - ./services/web/nginx/conf:/etc/nginx - - ./services/web/nginx/logs:/www/web_logs + - ./nginx/conf:/etc/nginx + - ./nginx/log:/var/log/nginx + - ./nginx/www:/usr/share/nginx/html networks: - - code-network + - dlc-dev-network depends_on: - php mysql: - image: registry.cn-hangzhou.aliyuncs.com/fecshopsoft/mysql + image: mysql restart: always volumes: - - ./db/mysql/data:/var/lib/mysql - - ./db/mysql/example_db:/var/example_db - - ./db/mysql/conf.d:/etc/mysql/conf.d + - ./mysql/etc:/etc/mysql + - ./mysql/data:/var/lib/mysql restart: always environment: - - MYSQL_ROOT_PASSWORD=fecshopxfd3ffaads123456 - - MYSQL_DATABASE=fecshop + - MYSQL_ROOT_PASSWORD=73937393 + - MYSQL_DATABASE=antsys networks: - - code-network + - dlc-dev-network php: - image: registry.cn-hangzhou.aliyuncs.com/fecshopsoft/php-7.1.13-fpm_2 + image: pay46/php7.3 restart: always volumes: - - ./app:/www/web - - ./services/php/etc/php7.1.13.ini:/usr/local/etc/php/conf.d/php7.1.13.ini + - ./nginx/www:/www + - ./php-fpm/etc:/usr/local/etc/php depends_on: - mongodb - mysql + - redis networks: - - code-network + - dlc-dev-network mongodb: - image: registry.cn-hangzhou.aliyuncs.com/fecshopsoft/mongo - restart: always - environment: - - MONGO_DATA_DIR=/data/db - - MONGO_LOG_DIR=/data/logs - volumes: - - ./db/mongodb/data:/data/db - - ./db/mongodb/example_db:/data/example_db - - ./db/mongodb/logs:/data/logs - networks: - - code-network - - xunsearch: - image: registry.cn-hangzhou.aliyuncs.com/fecshopsoft/xunsearch + image: mongo restart: always volumes: - - ./db/xunsearch/data:/usr/local/xunsearch/data + - ./mongodb/data:/data/db + - ./mongodb/log:/data/logs + environment: + - MONGO_INITDB_ROOT_USERNAME=root + - MONGO_INITDB_ROOT_PASSWORD=73937393 networks: - - code-network + - dlc-dev-network redis: - image: registry.cn-hangzhou.aliyuncs.com/fecshopsoft/redis + image: redis restart: always - environment: - REDIS_PASS_FILE: /run/secrets/redis-password command: [ "bash", "-c", ' docker-entrypoint.sh - --requirepass "$$(cat $$REDIS_PASS_FILE)" + --requirepass "73937393" ' ] volumes: - - ./db/redis/etc/redis.conf:/usr/local/etc/redis/redis.conf - - ./db/redis/data:/data - - ./db/redis/etc/redis-password:/run/secrets/redis-password + - ./redis/etc:/usr/local/etc/redis + - ./redis/data:/data networks: - - code-network + - dlc-dev-network networks: - code-network: - driver: bridge - - - - - + dlc-dev-network: + driver: bridge diff --git a/php-fpm/etc/php.ini-development b/php-fpm/etc/php.ini similarity index 100% rename from php-fpm/etc/php.ini-development rename to php-fpm/etc/php.ini