From 3ba01027de4127413de5a1d0155d5d95030349ea Mon Sep 17 00:00:00 2001 From: Babuuu <59009890+Meradoch@users.noreply.github.com> Date: Sat, 12 Feb 2022 15:09:15 +0300 Subject: [PATCH 1/2] Change mysql.user to mysql.global_priv -> for MariaDB 10.4+ (#650) Co-authored-by: meradoch --- development/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/development/README.md b/development/README.md index 9e073d7a..9ef0cb52 100644 --- a/development/README.md +++ b/development/README.md @@ -276,7 +276,7 @@ mysql -uroot -p123 -hmariadb Execute following queries replacing `db_name` and `db_password` with the values found in site_config.json. ```sql -UPDATE mysql.user SET Host = '%' where User = 'db_name'; FLUSH PRIVILEGES; +UPDATE mysql.global_priv SET Host = '%' where User = 'db_name'; FLUSH PRIVILEGES; SET PASSWORD FOR 'db_name'@'%' = PASSWORD('db_password'); FLUSH PRIVILEGES; GRANT ALL PRIVILEGES ON `db_name`.* TO 'db_name'@'%'; FLUSH PRIVILEGES; EXIT; From 66fca59f74a86e31913087e88af66bb97852c4dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 09:05:23 +0300 Subject: [PATCH 2/2] chore(deps): bump docker/bake-action from 1.6.0 to 1.7.0 (#665) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 1.6.0 to 1.7.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v1.6.0...v1.7.0) --- updated-dependencies: - dependency-name: docker/bake-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build_bench.yml | 4 ++-- .github/workflows/build_develop.yml | 8 ++++---- .github/workflows/build_stable.yml | 10 +++++----- .github/workflows/test.yml | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_bench.yml b/.github/workflows/build_bench.yml index b2f55fae..275ee59f 100644 --- a/.github/workflows/build_bench.yml +++ b/.github/workflows/build_bench.yml @@ -25,7 +25,7 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Build and test - uses: docker/bake-action@v1.6.0 + uses: docker/bake-action@v1.7.0 with: files: docker-bake.hcl targets: bench-test @@ -39,7 +39,7 @@ jobs: - name: Push if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - uses: docker/bake-action@v1.6.0 + uses: docker/bake-action@v1.7.0 with: targets: bench files: docker-bake.hcl diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml index 3d0320ad..54b2a420 100644 --- a/.github/workflows/build_develop.yml +++ b/.github/workflows/build_develop.yml @@ -48,14 +48,14 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build Frappe - uses: docker/bake-action@v1.6.0 + uses: docker/bake-action@v1.7.0 with: files: docker-bake.hcl targets: frappe-develop-test load: true - name: Push Frappe to local registry - uses: docker/bake-action@v1.6.0 + uses: docker/bake-action@v1.7.0 with: files: docker-bake.hcl targets: frappe-develop-test-local @@ -65,7 +65,7 @@ jobs: run: ./tests/test-frappe.sh - name: Build ERPNext - uses: docker/bake-action@v1.6.0 + uses: docker/bake-action@v1.7.0 with: files: docker-bake.hcl targets: erpnext-develop-test @@ -76,7 +76,7 @@ jobs: - name: Push if: env.IS_AUTHORIZED_RUN == 'true' - uses: docker/bake-action@v1.6.0 + uses: docker/bake-action@v1.7.0 with: files: docker-bake.hcl targets: frappe-develop,erpnext-develop diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml index 1126ac9b..15232975 100644 --- a/.github/workflows/build_stable.yml +++ b/.github/workflows/build_stable.yml @@ -69,14 +69,14 @@ jobs: VERSION: ${{ matrix.version }} - name: Build Frappe - uses: docker/bake-action@v1.6.0 + uses: docker/bake-action@v1.7.0 with: files: docker-bake.hcl targets: frappe-stable-test load: true - name: Push Frappe to local registry - uses: docker/bake-action@v1.6.0 + uses: docker/bake-action@v1.7.0 with: files: docker-bake.hcl targets: frappe-stable-test-local @@ -87,7 +87,7 @@ jobs: run: ./tests/test-frappe.sh - name: Build ERPNext - uses: docker/bake-action@v1.6.0 + uses: docker/bake-action@v1.7.0 with: files: docker-bake.hcl targets: erpnext-stable-test @@ -99,7 +99,7 @@ jobs: - name: Push Frappe if: env.IS_AUTHORIZED_RUN == 'true' - uses: docker/bake-action@v1.6.0 + uses: docker/bake-action@v1.7.0 with: files: docker-bake.hcl targets: frappe-stable @@ -109,7 +109,7 @@ jobs: - name: Push ERPNext if: env.IS_AUTHORIZED_RUN == 'true' - uses: docker/bake-action@v1.6.0 + uses: docker/bake-action@v1.7.0 with: files: docker-bake.hcl targets: erpnext-stable diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7f10ab85..b2f50f73 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,7 +50,7 @@ jobs: - name: Build if: github.event_name != 'schedule' - uses: docker/bake-action@v1.6.0 + uses: docker/bake-action@v1.7.0 with: files: docker-bake.hcl targets: frappe-develop,frappe-stable