Merge branch 'develop'

ogenes · Aug 4, 2021 · 7fdec84 · 7fdec84
2 parents d1f93bc + 9e2d29d
commit 7fdec84
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/mysql/docker.cnf b/mysql/docker.cnf
@@ -3,3 +3,4 @@ skip-host-cache
 skip-name-resolve
 
 sql_mode=""
+wait_timeout=1814400
diff --git a/php/Dockerfile b/php/Dockerfile
@@ -74,16 +74,26 @@ fi
 
 # 安装 Redis 扩展
 RUN pecl install -o -f redis \
-  && rm -rf /tmp/pear \
   && docker-php-ext-enable redis
 
+# 安装 grpc 扩展
+RUN pecl install grpc \
+  && docker-php-ext-enable grpc
+
+# 安装 protobuf 扩展
+RUN pecl install protobuf \
+  && docker-php-ext-enable protobuf
+
+RUN rm -rf /tmp/pear
+
 # 安装 Composer
 ENV COMPOSER_HOME /var/www/.composer
 RUN curl -sS https://install.phpcomposer.com/installer | php -- --install-dir=/usr/bin --filename=composer
 RUN composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/
+
 RUN curl -sS https://install.phpcomposer.com/installer | php -- --install-dir=/usr/bin --filename=composer1
 RUN composer1 config -g repo.packagist composer https://mirrors.aliyun.com/composer/ \
-    && composer self-update --1
+    && composer1 self-update --1
 
 RUN chown -R www-data:www-data /var/www/
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@ skip-host-cache
		skip-name-resolve

		sql_mode=""
		wait_timeout=1814400