diff --git a/.env.example b/.env.example index 13bc982d..13b7ae8a 100644 --- a/.env.example +++ b/.env.example @@ -1003,3 +1003,8 @@ ELK_VERSION=7.9.1 ### Tarantool ################################################## TARANTOOL_PORT=3301 TARANTOOL_ADMIN_PORT=8002 + +### NATS ################################################## +NATS_CLIENT_PORT=4222 +NATS_MONITORING_PORT=6222 +NATS_ROUTE_PORT=8222 diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index 701b3fa8..5d5e6c59 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -958,7 +958,7 @@ More details about this [here](https://github.com/jenssegers/laravel-mongodb#ins docker-compose up -d mariadb phpmyadmin ``` *Note: To use with MariaDB, open `.env` and set `PMA_DB_ENGINE=mysql` to `PMA_DB_ENGINE=mariadb`.* -2. Open your browser and visit the localhost on port **8080**: `http://localhost:8080` +2. Open your browser and visit the localhost on port **8081**: `http://localhost:8081`, use server: "mysql", user: "default" and password: "secret for the default mysql setup. diff --git a/README-zh.md b/README-zh.md index 6055f2df..e519ef13 100644 --- a/README-zh.md +++ b/README-zh.md @@ -72,6 +72,21 @@ git clone https://github.com/laradock/laradock.git ```bash cp .env.example .env ``` +如果你在中国内地，可以修改一些配置来进行镜像加速，不过build时还是会请求GitHub来下载一些文件，此时需要保证你的计算机能连上GitHub +(1）配置DockerHub镜像加速，[链接](https://www.runoob.com/docker/docker-mirror-acceleration.html) +(2) 修改.env +``` +# 开启ubuntu国内源 +CHANGE_SOURCE=true +# 默认是阿里云，可选项有aliyun|zju|tsinghua|163|ustc +UBUNTU_SOURCE=aliyun +# composer镜像源 +WORKSPACE_COMPOSER_REPO_PACKAGIST=https://mirrors.aliyun.com/composer/ +# nvm镜像源 +WORKSPACE_NVM_NODEJS_ORG_MIRROR=https://npm.taobao.org/mirrors/node +# npm镜像源 +WORKSPACE_NPM_REGISTRY=https://registry.npm.taobao.org +``` 3. 运行这些容器。 ```bash diff --git a/adminer/Dockerfile b/adminer/Dockerfile index cb399771..61ca8d92 100644 --- a/adminer/Dockerfile +++ b/adminer/Dockerfile @@ -9,19 +9,19 @@ VOLUME /sessions # SQL SERVER: ##################################### USER root + ARG INSTALL_MSSQL=false ENV INSTALL_MSSQL ${INSTALL_MSSQL} + RUN if [ ${INSTALL_MSSQL} = true ]; then \ set -xe \ - # && apk --update add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc unixodbc-dev \ - # && pecl channel-update pecl.php.net \ - # && pecl install pdo_sqlsrv-4.1.8preview sqlsrv-4.1.8preview \ - # && echo "extension=sqlsrv.so" > /usr/local/etc/php/conf.d/20-sqlsrv.ini \ - # && echo "extension=pdo_sqlsrv.so" > /usr/local/etc/php/conf.d/20-pdo_sqlsrv.ini \ - && apk --update add --no-cache freetds unixodbc \ - && apk --update add --no-cache --virtual .build-deps $PHPIZE_DEPS freetds-dev unixodbc-dev \ - && docker-php-ext-install pdo_dblib \ - && apk del .build-deps \ + && apk update \ + && apk add --no-cache --virtual .php-build-dependencies unixodbc-dev freetds-dev \ + && apk add --virtual .php-runtime-dependencies unixodbc freetds \ + && docker-php-ext-configure pdo_odbc --with-pdo-odbc=unixODBC,/usr \ + && docker-php-ext-install pdo_odbc pdo_dblib \ + && apk del .php-build-dependencies \ + && rm -rf /var/cache/apk/* \ ;fi USER adminer diff --git a/apache2/startup.sh b/apache2/startup.sh index c3b0e04d..d4eb6dc3 100644 --- a/apache2/startup.sh +++ b/apache2/startup.sh @@ -17,5 +17,5 @@ if [ ${APACHE_HTTP2} = true ]; then service apache2 restart fi -# Start supervisord in foreground -supervisord +# Start apache in foreground +/usr/sbin/apache2ctl -D FOREGROUND diff --git a/docker-compose.yml b/docker-compose.yml index 62c3bcf5..f28bc4cf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -522,7 +522,7 @@ services: - SA_PASSWORD=${MSSQL_PASSWORD} - ACCEPT_EULA=Y volumes: - - ${DATA_PATH_HOST}/mssql:/var/opt/mssql + - mssql:/var/opt/mssql ports: - "${MSSQL_PORT}:1433" networks: @@ -612,6 +612,15 @@ services: image: 'neo4j:latest' networks: - backend +### Nats ################################################ + nats: + build: ./nats + ports: + - "${NATS_CLIENT_PORT}:4222" + - "${NATS_MONITORING_PORT}:6222" + - "${NATS_ROUTE_PORT}:8222" + networks: + - backend ### MongoDB ############################################## mongo: diff --git a/mariadb/my.cnf b/mariadb/my.cnf index f14f2690..fd51f7ea 100644 --- a/mariadb/my.cnf +++ b/mariadb/my.cnf @@ -5,3 +5,6 @@ # For explanations see # http://dev.mysql.com/doc/mysql/en/server-system-variables.html +[mysqld] +innodb_log_file_size = 4048M +innodb_strict_mode = 0 diff --git a/nats/Dockerfile b/nats/Dockerfile new file mode 100644 index 00000000..9e381b2f --- /dev/null +++ b/nats/Dockerfile @@ -0,0 +1,5 @@ +FROM nats:latest + +LABEL maintainer="Alexander Palchikov " + +COPY nats-server.conf /etc/nats/nats-server.conf \ No newline at end of file diff --git a/nats/nats-server.conf b/nats/nats-server.conf new file mode 100644 index 00000000..cac772b0 --- /dev/null +++ b/nats/nats-server.conf @@ -0,0 +1,25 @@ +# Client port of 4222 on all interfaces +port: 4222 + +# HTTP monitoring port +monitor_port: 8222 + +# This is for clustering multiple servers together. +cluster { + + # Route connections to be received on any interface on port 6222 + port: 6222 + + # Routes are protected, so need to use them with --routes flag + # e.g. --routes=nats-route://ruser:T0pS3cr3t@otherdockerhost:6222 + authorization { + user: ruser + password: T0pS3cr3t + timeout: 2 + } + + # Routes are actively solicited and connected to from this server. + # This Docker image has none by default, but you can pass a + # flag to the gnatsd docker image to create one to an existing server. + routes = [] +} \ No newline at end of file diff --git a/workspace/sources.sh b/workspace/sources.sh index eef06706..6ad796b6 100755 --- a/workspace/sources.sh +++ b/workspace/sources.sh @@ -8,76 +8,76 @@ if type "tee" 2>/dev/null && [ -n "${UBUNTU_SOURCE}" ]; then case "${UBUNTU_SOURCE}" in "aliyun") tee ${SOURCE_PATH} <<-'EOF' -deb http://mirrors.aliyun.com/ubuntu/ bionic main restricted universe multiverse -deb http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted universe multiverse -deb http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted universe multiverse -deb http://mirrors.aliyun.com/ubuntu/ bionic-proposed main restricted universe multiverse -deb http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ bionic main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ bionic-security main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ bionic-updates main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ bionic-proposed main restricted universe multiverse -deb-src http://mirrors.aliyun.com/ubuntu/ bionic-backports main restricted universe multiverse +deb http://mirrors.aliyun.com/ubuntu/ focal main restricted universe multiverse +deb http://mirrors.aliyun.com/ubuntu/ focal-security main restricted universe multiverse +deb http://mirrors.aliyun.com/ubuntu/ focal-updates main restricted universe multiverse +deb http://mirrors.aliyun.com/ubuntu/ focal-proposed main restricted universe multiverse +deb http://mirrors.aliyun.com/ubuntu/ focal-backports main restricted universe multiverse +deb-src http://mirrors.aliyun.com/ubuntu/ focal main restricted universe multiverse +deb-src http://mirrors.aliyun.com/ubuntu/ focal-security main restricted universe multiverse +deb-src http://mirrors.aliyun.com/ubuntu/ focal-updates main restricted universe multiverse +deb-src http://mirrors.aliyun.com/ubuntu/ focal-proposed main restricted universe multiverse +deb-src http://mirrors.aliyun.com/ubuntu/ focal-backports main restricted universe multiverse EOF ;; "zju") tee ${SOURCE_PATH} <<-'EOF' -deb http://mirrors.zju.edu.cn/ubuntu/ bionic main multiverse restricted universe -deb http://mirrors.zju.edu.cn/ubuntu/ bionic-backports main multiverse restricted universe -deb http://mirrors.zju.edu.cn/ubuntu/ bionic-proposed main multiverse restricted universe -deb http://mirrors.zju.edu.cn/ubuntu/ bionic-security main multiverse restricted universe -deb http://mirrors.zju.edu.cn/ubuntu/ bionic-updates main multiverse restricted universe -deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic main multiverse restricted universe -deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-backports main multiverse restricted universe -deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-proposed main multiverse restricted universe -deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-security main multiverse restricted universe -deb-src http://mirrors.zju.edu.cn/ubuntu/ bionic-updates main multiverse restricted universe +deb http://mirrors.zju.edu.cn/ubuntu/ focal main multiverse restricted universe +deb http://mirrors.zju.edu.cn/ubuntu/ focal-backports main multiverse restricted universe +deb http://mirrors.zju.edu.cn/ubuntu/ focal-proposed main multiverse restricted universe +deb http://mirrors.zju.edu.cn/ubuntu/ focal-security main multiverse restricted universe +deb http://mirrors.zju.edu.cn/ubuntu/ focal-updates main multiverse restricted universe +deb-src http://mirrors.zju.edu.cn/ubuntu/ focal main multiverse restricted universe +deb-src http://mirrors.zju.edu.cn/ubuntu/ focal-backports main multiverse restricted universe +deb-src http://mirrors.zju.edu.cn/ubuntu/ focal-proposed main multiverse restricted universe +deb-src http://mirrors.zju.edu.cn/ubuntu/ focal-security main multiverse restricted universe +deb-src http://mirrors.zju.edu.cn/ubuntu/ focal-updates main multiverse restricted universe EOF ;; "tsinghua") tee ${SOURCE_PATH} <<-'EOF' -deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic main restricted universe multiverse -deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic main restricted universe multiverse -deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse -deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse -deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse -deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse -deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-security main restricted universe multiverse -deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-security main restricted universe multiverse -deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse -deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse +deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal main restricted universe multiverse +deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal main restricted universe multiverse +deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal-updates main restricted universe multiverse +deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal-updates main restricted universe multiverse +deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal-backports main restricted universe multiverse +deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal-backports main restricted universe multiverse +deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal-security main restricted universe multiverse +deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal-security main restricted universe multiverse +deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal-proposed main restricted universe multiverse +deb-src https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ focal-proposed main restricted universe multiverse EOF ;; "163") tee ${SOURCE_PATH} <<-'EOF' -deb http://mirrors.163.com/ubuntu/ bionic main restricted universe multiverse -deb http://mirrors.163.com/ubuntu/ bionic-security main restricted universe multiverse -deb http://mirrors.163.com/ubuntu/ bionic-updates main restricted universe multiverse -deb http://mirrors.163.com/ubuntu/ bionic-proposed main restricted universe multiverse -deb http://mirrors.163.com/ubuntu/ bionic-backports main restricted universe multiverse -deb-src http://mirrors.163.com/ubuntu/ bionic main restricted universe multiverse -deb-src http://mirrors.163.com/ubuntu/ bionic-security main restricted universe multiverse -deb-src http://mirrors.163.com/ubuntu/ bionic-updates main restricted universe multiverse -deb-src http://mirrors.163.com/ubuntu/ bionic-proposed main restricted universe multiverse -deb-src http://mirrors.163.com/ubuntu/ bionic-backports main restricted universe multiverse +deb http://mirrors.163.com/ubuntu/ focal main restricted universe multiverse +deb http://mirrors.163.com/ubuntu/ focal-security main restricted universe multiverse +deb http://mirrors.163.com/ubuntu/ focal-updates main restricted universe multiverse +deb http://mirrors.163.com/ubuntu/ focal-proposed main restricted universe multiverse +deb http://mirrors.163.com/ubuntu/ focal-backports main restricted universe multiverse +deb-src http://mirrors.163.com/ubuntu/ focal main restricted universe multiverse +deb-src http://mirrors.163.com/ubuntu/ focal-security main restricted universe multiverse +deb-src http://mirrors.163.com/ubuntu/ focal-updates main restricted universe multiverse +deb-src http://mirrors.163.com/ubuntu/ focal-proposed main restricted universe multiverse +deb-src http://mirrors.163.com/ubuntu/ focal-backports main restricted universe multiverse EOF ;; "ustc") tee ${SOURCE_PATH} <<-'EOF' -deb https://mirrors.ustc.edu.cn/ubuntu/ bionic main restricted universe multiverse -deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic main restricted universe multiverse -deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse -deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-updates main restricted universe multiverse -deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse -deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-backports main restricted universe multiverse -deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-security main restricted universe multiverse -deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-security main restricted universe multiverse -deb https://mirrors.ustc.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse -deb-src https://mirrors.ustc.edu.cn/ubuntu/ bionic-proposed main restricted universe multiverse +deb https://mirrors.ustc.edu.cn/ubuntu/ focal main restricted universe multiverse +deb-src https://mirrors.ustc.edu.cn/ubuntu/ focal main restricted universe multiverse +deb https://mirrors.ustc.edu.cn/ubuntu/ focal-updates main restricted universe multiverse +deb-src https://mirrors.ustc.edu.cn/ubuntu/ focal-updates main restricted universe multiverse +deb https://mirrors.ustc.edu.cn/ubuntu/ focal-backports main restricted universe multiverse +deb-src https://mirrors.ustc.edu.cn/ubuntu/ focal-backports main restricted universe multiverse +deb https://mirrors.ustc.edu.cn/ubuntu/ focal-security main restricted universe multiverse +deb-src https://mirrors.ustc.edu.cn/ubuntu/ focal-security main restricted universe multiverse +deb https://mirrors.ustc.edu.cn/ubuntu/ focal-proposed main restricted universe multiverse +deb-src https://mirrors.ustc.edu.cn/ubuntu/ focal-proposed main restricted universe multiverse EOF ;; *) echo "Please check whether there is aliyun|zju|tsinghua|163|ustc in the parameter" exit 1;; esac -fi \ No newline at end of file +fi