diff --git a/.github/workflows/build_bench.yml b/.github/workflows/build_bench.yml index e5a61141..1835f1c3 100644 --- a/.github/workflows/build_bench.yml +++ b/.github/workflows/build_bench.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup QEMU uses: docker/setup-qemu-action@v3 @@ -38,7 +38,7 @@ jobs: run: echo "LATEST_BENCH_RELEASE=$(curl -s 'https://api.github.com/repos/frappe/bench/releases/latest' | jq -r '.tag_name')" >> "$GITHUB_ENV" - name: Build and test - uses: docker/bake-action@v6.8.0 + uses: docker/bake-action@v6.9.0 with: source: . targets: bench-test @@ -52,7 +52,7 @@ jobs: - name: Push if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - uses: docker/bake-action@v6.8.0 + uses: docker/bake-action@v6.9.0 with: targets: bench push: true diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml index 275c22ac..6ddbb0ea 100644 --- a/.github/workflows/build_stable.yml +++ b/.github/workflows/build_stable.yml @@ -62,10 +62,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: "3.10" diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 3694ec00..d17dbf9e 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -43,7 +43,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup QEMU uses: docker/setup-qemu-action@v3 @@ -66,7 +66,7 @@ jobs: echo "NODE_VERSION=${{ inputs.node_version }}" >> "$GITHUB_ENV" - name: Build - uses: docker/bake-action@v6.8.0 + uses: docker/bake-action@v6.9.0 with: source: . push: true @@ -74,7 +74,7 @@ jobs: REGISTRY_USER: localhost:5000/frappe - name: Setup Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: "3.10" @@ -95,7 +95,7 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v6.8.0 + uses: docker/bake-action@v6.9.0 with: push: true set: "*.platform=linux/amd64,linux/arm64" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ce4ab6ee..6f72e86b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,16 +13,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: "3.10.6" # For shfmt pre-commit hook - name: Setup Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version: "^1.14" diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index 5612c735..29a5b5af 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Update pre-commit hooks uses: vrslev/pre-commit-autoupdate@v1.0.0 diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 024ade1c..8849bfea 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -9,7 +9,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v9 + - uses: actions/stale@v10 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: This issue has been automatically marked as stale. You have a week to explain why you believe this is an error. diff --git a/README.md b/README.md index 39f843eb..32edc8e4 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Then run: `docker compose -f pwd.yml up -d` ### To run on ARM64 architecture follow this instructions -After cloning the repo run this command to build multi-architecture images specifically for ARM64. +After you clone the repo and `cd frappe_docker`, run this command to build multi-architecture images specifically for ARM64. `docker buildx bake --no-cache --set "*.platform=linux/arm64"` diff --git a/docs/site-operations.md b/docs/site-operations.md index 550d9bdf..ef3b7b07 100644 --- a/docs/site-operations.md +++ b/docs/site-operations.md @@ -1,16 +1,16 @@ # Site operations -> 💡 You should setup `--project-name` option in `docker-compose` commands if you have non-standard project name. +> 💡 You should setup `--project-name` option in `docker` commands if you have non-standard project name. ## Setup new site Note: - Wait for the `db` service to start and `configurator` to exit before trying to create a new site. Usually this takes up to 10 seconds. -- Also you have to pass `-p ` if `-p` passed previously eg. `docker-compose -p exec (rest of the command)`. +- Also you have to pass `-p ` if `-p` passed previously eg. `docker -p exec (rest of the command)`. ```sh -docker-compose exec backend bench new-site --mariadb-user-host-login-scope=% --db-root-password --admin-password +docker exec backend bench new-site --mariadb-user-host-login-scope=% --db-root-password --admin-password ``` If you need to install some app, specify `--install-app`. To see all options, just run `bench new-site --help`. @@ -18,14 +18,14 @@ If you need to install some app, specify `--install-app`. To see all options, ju To create Postgres site (assuming you already use [Postgres compose override](images-and-compose-files.md#overrides)) you need have to do set `root_login` and `root_password` in common config before that: ```sh -docker-compose exec backend bench set-config -g root_login -docker-compose exec backend bench set-config -g root_password +docker exec backend bench set-config -g root_login +docker exec backend bench set-config -g root_password ``` Also command is slightly different: ```sh -docker-compose exec backend bench new-site --mariadb-user-host-login-scope=% --db-type postgres --admin-password +docker exec backend bench new-site --mariadb-user-host-login-scope=% --db-type postgres --admin-password ``` ## Push backup to S3 storage @@ -33,7 +33,7 @@ docker-compose exec backend bench new-site --mariadb-user-host-login-scope=% --d We have the script that helps to push latest backup to S3. ```sh -docker-compose exec backend push_backup.py --site-name --bucket --region-name --endpoint-url --aws-access-key-id --aws-secret-access-key +docker exec backend push_backup.py --site-name --bucket --region-name --endpoint-url --aws-access-key-id --aws-secret-access-key ``` Note that you can restore backup only manually. @@ -59,7 +59,7 @@ Instead of `alpine` use any image of your choice. For socketio and gunicorn service ping the hostname:port and that will be sufficient. For workers and scheduler, there is a command that needs to be executed. ```shell -docker-compose exec backend healthcheck.sh --ping-service mongodb:27017 +docker exec backend healthcheck.sh --ping-service mongodb:27017 ``` Additional services can be pinged as part of health check with option `-p` or `--ping-service`. @@ -72,7 +72,7 @@ If connection to service(s) fails, the command fails with exit code 1. For reference of commands like `backup`, `drop-site` or `migrate` check [official guide](https://frappeframework.com/docs/v13/user/en/bench/frappe-commands) or run: ```sh -docker-compose exec backend bench --help +docker exec backend bench --help ``` ## Migrate site @@ -82,5 +82,5 @@ Note: - Wait for the `db` service to start and `configurator` to exit before trying to migrate a site. Usually this takes up to 10 seconds. ```sh -docker-compose exec backend bench --site migrate +docker exec backend bench --site migrate ``` diff --git a/example.env b/example.env index 1084d777..378a6324 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.75.1 +ERPNEXT_VERSION=v15.78.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 8fd88c9a..c75ec63e 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.75.1 + image: frappe/erpnext:v15.78.1 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.75.1 + image: frappe/erpnext:v15.78.1 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.75.1 + image: frappe/erpnext:v15.78.1 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.75.1 + image: frappe/erpnext:v15.78.1 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.75.1 + image: frappe/erpnext:v15.78.1 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.75.1 + image: frappe/erpnext:v15.78.1 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.75.1 + image: frappe/erpnext:v15.78.1 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.75.1 + image: frappe/erpnext:v15.78.1 networks: - frappe_network deploy: diff --git a/requirements-test.txt b/requirements-test.txt index 8e0e8841..9471b3d9 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.4.1 +pytest==8.4.2