From 3ad37405c6cd91304a0e286dcc2d75f8931beffa Mon Sep 17 00:00:00 2001 From: Pavel Date: Thu, 24 Jan 2019 20:25:08 +0300 Subject: [PATCH 1/6] Chmod --- mariadb/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile index 0dcb9481..1929726a 100644 --- a/mariadb/Dockerfile +++ b/mariadb/Dockerfile @@ -4,6 +4,8 @@ LABEL maintainer="Mahmoud Zalt " COPY my.cnf /etc/mysql/conf.d/my.cnf +RUN chmod -R 644 /etc/mysql/conf.d/my.cnf + CMD ["mysqld"] EXPOSE 3306 From 237e39b40d11b56540803bd17bd73b7c48141fcc Mon Sep 17 00:00:00 2001 From: PeliCan <51474517+pelicancode@users.noreply.github.com> Date: Sat, 21 Sep 2019 15:56:09 +0200 Subject: [PATCH 2/6] MySql config file permissions fix Reason: [Warning] World-writable config file '/etc/mysql/docker-default.d/my.cnf' is ignored --- mysql/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql/Dockerfile b/mysql/Dockerfile index 3fe5bdcf..03bb15ca 100644 --- a/mysql/Dockerfile +++ b/mysql/Dockerfile @@ -13,6 +13,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone & COPY my.cnf /etc/mysql/conf.d/my.cnf +RUN chmod 0444 /etc/mysql/conf.d/my.cnf + CMD ["mysqld"] EXPOSE 3306 From b7b468765ac0fcf19b5c7065e24f3ea0d3134b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?= Date: Tue, 8 Oct 2019 09:11:02 -0300 Subject: [PATCH 3/6] Add sample configuration for Visual Studio Code Remote Development on Containers. --- .devcontainer/devcontainer.example.json | 9 +++++++++ .gitignore | 5 ++++- DOCUMENTATION/content/guides/index.md | 10 ++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 .devcontainer/devcontainer.example.json diff --git a/.devcontainer/devcontainer.example.json b/.devcontainer/devcontainer.example.json new file mode 100644 index 00000000..4be22f7f --- /dev/null +++ b/.devcontainer/devcontainer.example.json @@ -0,0 +1,9 @@ +{ + "name": "Laradock", + "dockerComposeFile": ["../docker-compose.yml"], + "runServices": ["nginx", "postgres", "pgadmin"], + "service": "workspace", + "workspaceFolder": "/var/www", + "shutdownAction": "stopCompose", + "postCreateCommand": "uname -a" +} diff --git a/.gitignore b/.gitignore index 06732062..06eccb52 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,7 @@ /nginx/ssl/*.key /nginx/ssl/*.csr -.DS_Store \ No newline at end of file +/.devcontainer/* +!/.devcontainer/devcontainer.example.json + +.DS_Store diff --git a/DOCUMENTATION/content/guides/index.md b/DOCUMENTATION/content/guides/index.md index 9ffd0140..ab8c9c7e 100644 --- a/DOCUMENTATION/content/guides/index.md +++ b/DOCUMENTATION/content/guides/index.md @@ -70,6 +70,16 @@ If you want to only execute some command and don't want to enter bash, you can e docker-compose run workspace php artisan migrate ``` +### Prepare for Visual Studio Code remote development + +If you want to use Visual Studio Code for [remote development](https://code.visualstudio.com/docs/remote/containers) directly on your `workspace` container, copy file `devcontainer.example.json` to `devcontainer.json` and customize it (see [devcontainer.json reference](https://code.visualstudio.com/docs/remote/containers#_devcontainerjson-reference) for more options): +``` +cd .devcontainer +cp devcontainer.example.json devcontainer.json +``` + +Then open your `laradock` folder in Visual Studio Code and click on popup button **Reopen in Container**. + ### Install and configure Laravel Let's install Laravel's dependencies, add the `.env` file, generate the key and give proper permissions to the cache folder. From ef9eee2defacfeaba343a9130602ed7f09791d7b Mon Sep 17 00:00:00 2001 From: Mike Hingley Date: Fri, 25 Oct 2019 16:45:46 +0100 Subject: [PATCH 4/6] fix slight typo --- DOCUMENTATION/content/documentation/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index d83b4422..e3ebbcbe 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -650,7 +650,7 @@ docker-compose up -d metabase 1) Boot the container `docker-compose up -d jenkins`. To enter the container type `docker-compose exec jenkins bash`. -2) Go to `http://localhost:8090/` (if you didn't chanhed your default port mapping) +2) Go to `http://localhost:8090/` (if you didn't change your default port mapping) 3) Authenticate from the web app. From f5c00c61bed2358a293e7ff4e838e4f2904fde3b Mon Sep 17 00:00:00 2001 From: Mike Hingley Date: Fri, 25 Oct 2019 17:12:59 +0100 Subject: [PATCH 5/6] Update Confluence section The original text was confusing. Refactored to attempt to make more sense. --- DOCUMENTATION/content/documentation/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index e3ebbcbe..d2b91fb4 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -1054,7 +1054,7 @@ docker-compose up -d confluence 2 - Open your browser and visit the localhost on port **8090**: `http://localhost:8090` -**Note:** You can you trial version and then you have to buy a licence to use it. +**Note:** Confluence is a licensed application - an evaluation licence can be obtained from Atlassian. You can set custom confluence version in `CONFLUENCE_VERSION`. [Find more info in section 'Versioning'](https://hub.docker.com/r/atlassian/confluence-server/) From 7247d8f7cef1c71595c08b5f1bcf3d14cba12b9a Mon Sep 17 00:00:00 2001 From: Lukas Besch Date: Fri, 25 Oct 2019 18:15:40 +0200 Subject: [PATCH 6/6] Install default-mysql-client for PHP 7.3 (#2329) Install default-mysql-client for PHP 7.3 --- php-fpm/Dockerfile | 6 +++++- php-worker/Dockerfile | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index d74ef345..69e8374f 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -708,7 +708,11 @@ ARG INSTALL_MYSQL_CLIENT=false RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \ apt-get update -yqq && \ - apt-get -y install mysql-client \ + if [ ${LARADOCK_PHP_VERSION} = "7.3" ]; then \ + apt-get -y install default-mysql-client \ + ;else \ + apt-get -y install mysql-client \ + ;fi \ ;fi ########################################################################### diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index ac0c1404..9bccca0e 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -66,7 +66,11 @@ RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \ # Install MySQL Client: ARG INSTALL_MYSQL_CLIENT=false RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \ - apk --update add mysql-client \ + if [ ${PHP_VERSION} = "7.3" ]; then \ + apk --update add default-mysql-client \ + ;else \ + apk --update add mysql-client \ + ;fi \ ;fi # Install FFMPEG: