diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml index e37c5858..6103fd5f 100644 --- a/.github/workflows/build_develop.yml +++ b/.github/workflows/build_develop.yml @@ -27,7 +27,7 @@ jobs: version: develop push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} python_version: 3.11.6 - node_version: 18.18.2 + node_version: 20.19.2 secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml index cd9e6139..6ddbb0ea 100644 --- a/.github/workflows/build_stable.yml +++ b/.github/workflows/build_stable.yml @@ -65,7 +65,7 @@ jobs: 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 2323cba7..d17dbf9e 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -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" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4879c337..6f72e86b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,13 +16,13 @@ jobs: 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/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/devcontainer-example/docker-compose.yml b/devcontainer-example/docker-compose.yml index 3df5c417..0a614cbf 100644 --- a/devcontainer-example/docker-compose.yml +++ b/devcontainer-example/docker-compose.yml @@ -2,7 +2,6 @@ version: "3.7" services: mariadb: image: docker.io/mariadb:10.6 - platform: linux/amd64 command: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_unicode_ci @@ -15,7 +14,7 @@ services: # Enable PostgreSQL only if you use it, see development/README.md for more information. # postgresql: - # image: postgres:11.8 + # image: postgres:14 # environment: # POSTGRES_PASSWORD: 123 # volumes: @@ -38,15 +37,14 @@ services: redis-cache: image: docker.io/redis:alpine - platform: linux/amd64 redis-queue: image: docker.io/redis:alpine - platform: linux/amd64 frappe: image: docker.io/frappe/bench:latest - platform: linux/amd64 + # If you want to build the current bench image the Containerfile is in this Repo. + # build: ../images/bench command: sleep infinity environment: - SHELL=/bin/bash diff --git a/docker-bake.hcl b/docker-bake.hcl index 3304ce40..9d3ccd00 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -9,7 +9,7 @@ variable PYTHON_VERSION { default = "3.11.6" } variable NODE_VERSION { - default = "18.18.2" + default = "20.19.2" } variable "FRAPPE_VERSION" { diff --git a/example.env b/example.env index e34d73cb..103f761b 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.78.0 +ERPNEXT_VERSION=v15.80.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 590f132a..273e0f24 100644 --- a/pwd.yml +++ b/pwd.yml @@ -24,7 +24,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.78.0 + image: frappe/erpnext:v15.80.0 networks: - frappe_network deploy: @@ -57,7 +57,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.78.0 + image: frappe/erpnext:v15.80.0 networks: - frappe_network deploy: @@ -112,7 +112,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.78.0 + image: frappe/erpnext:v15.80.0 networks: - frappe_network depends_on: @@ -138,7 +138,7 @@ services: - "8081:8080" queue-long: - image: frappe/erpnext:v15.78.0 + image: frappe/erpnext:v15.80.0 networks: - frappe_network deploy: @@ -154,7 +154,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.78.0 + image: frappe/erpnext:v15.80.0 networks: - frappe_network deploy: @@ -188,7 +188,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.78.0 + image: frappe/erpnext:v15.80.0 networks: - frappe_network deploy: @@ -202,7 +202,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.78.0 + image: frappe/erpnext:v15.80.0 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