Merge remote-tracking branch 'laradock/master' into dev

# Conflicts: # docker-compose.yml
Faks · Oct 21, 2023 · 842c8ff · 842c8ff
2 parents 6736df1 + b958fc0
commit 842c8ff
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -178,6 +178,7 @@ services:
           - INSTALL_EVENT=${WORKSPACE_INSTALL_EVENT}
           - INSTALL_DNSUTILS=${WORKSPACE_INSTALL_DNSUTILS}
           - INSTALL_POPPLER_UTILS=${WORKSPACE_INSTALL_POPPLER_UTILS}
+          - INSTALL_JDK=${WORKSPACE_INSTALL_JDK}
           - http_proxy
           - https_proxy
           - no_proxy
@@ -338,6 +339,7 @@ services:
       extra_hosts:
         - "dockerhost:${DOCKER_HOST_IP}"
       environment:
+        - PHP_IDE_CONFIG=${PHP_IDE_CONFIG}
         - DOCKER_HOST=tcp://docker-in-docker:2376
         - DOCKER_TLS_VERIFY=1
         - DOCKER_TLS_CERTDIR=/certs

diff --git a/mysql/Dockerfile b/mysql/Dockerfile
@@ -15,6 +15,4 @@ COPY my.cnf /etc/mysql/conf.d/my.cnf
 
 RUN chmod 0444 /etc/mysql/conf.d/my.cnf
 
-CMD ["mysqld"]
-
 EXPOSE 3306
diff --git a/mysql/my.cnf b/mysql/my.cnf
@@ -10,7 +10,3 @@ sql-mode="STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGI
 character-set-server=utf8
 default-authentication-plugin=mysql_native_password
 innodb_use_native_aio=0
-
-[client]
-user=root
-password="root"
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
@@ -772,7 +772,7 @@ RUN set -eux; \
       ;fi \
       && curl https://packages.microsoft.com/config/debian/$(lsb_release -rs)/prod.list > /etc/apt/sources.list.d/mssql-release.list \
       && apt-get update -yqq \
-      && ACCEPT_EULA=Y apt-get install -yqq unixodbc unixodbc-dev libgss3 odbcinst msodbcsql17 locales \
+      && ACCEPT_EULA=Y apt-get install -yqq unixodbc unixodbc-dev libgss3 odbcinst msodbcsql18 locales \
       && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
       && ln -sfn /etc/locale.alias /usr/share/locale/locale.alias \
       && locale-gen \

diff --git a/workspace/Dockerfile b/workspace/Dockerfile
@@ -1118,7 +1118,7 @@ RUN set -eux; \
       curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
       curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
       apt-get update -yqq && \
-      ACCEPT_EULA=Y apt-get install -yqq msodbcsql17 mssql-tools unixodbc unixodbc-dev libgss3 odbcinst locales && \
+      ACCEPT_EULA=Y apt-get install -yqq msodbcsql18 mssql-tools18 unixodbc unixodbc-dev libgss3 odbcinst locales && \
       ln -sfn /opt/mssql-tools/bin/sqlcmd /usr/bin/sqlcmd && \
       ln -sfn /opt/mssql-tools/bin/bcp /usr/bin/bcp && \
       echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,6 +15,4 @@ COPY my.cnf /etc/mysql/conf.d/my.cnf

		RUN chmod 0444 /etc/mysql/conf.d/my.cnf

		CMD ["mysqld"]

		EXPOSE 3306