Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
b7e9e65
Merge pull request #270 from frappe/develop
revant Jun 17, 2020
4ce9fcf
Merge pull request #273 from frappe/develop
revant Jun 18, 2020
b59b69d
Merge pull request #275 from frappe/develop
revant Jun 18, 2020
32346e9
Merge pull request #278 from frappe/develop
revant Jun 19, 2020
3231537
Merge pull request #283 from frappe/develop
revant Jun 22, 2020
03d53cf
Merge pull request #287 from frappe/develop
revant Jun 26, 2020
5699ffa
Merge pull request #294 from frappe/develop
revant Jul 1, 2020
66f774b
Merge pull request #297 from frappe/develop
revant Jul 2, 2020
274d278
Merge pull request #301 from frappe/develop
revant Jul 7, 2020
b4685bd
Merge pull request #309 from frappe/develop
revant Jul 14, 2020
024d536
Merge pull request #324 from frappe/develop
revant Aug 2, 2020
1a7bb46
Merge pull request #327 from frappe/develop
revant Aug 4, 2020
c4d382e
Merge pull request #331 from frappe/develop
revant Aug 7, 2020
7cca81c
Merge pull request #336 from frappe/develop
revant Aug 13, 2020
b4f770a
Merge pull request #338 from frappe/develop
revant Aug 31, 2020
2835b90
Merge pull request #344 from frappe/develop
revant Sep 10, 2020
cf81358
Merge pull request #350 from frappe/develop
revant Sep 16, 2020
6a4ba58
Merge pull request #364 from frappe/develop
Thunderbottom Oct 6, 2020
8e4c788
Merge pull request #369 from frappe/develop
revant Oct 15, 2020
a8dd0a2
Merge pull request #372 from frappe/develop
revant Oct 28, 2020
060ee84
Merge pull request #374 from frappe/develop
revant Oct 29, 2020
997b0fc
Merge pull request #382 from frappe/develop
Thunderbottom Nov 24, 2020
c2ef86d
Merge pull request #398 from frappe/develop
revant Jan 3, 2021
d8d0647
Merge pull request #406 from frappe/develop
revant Jan 15, 2021
6d32c56
Merge pull request #410 from frappe/develop
revant Jan 21, 2021
4577c73
Merge pull request #416 from frappe/develop
revant Feb 3, 2021
34f7702
Merge pull request #421 from frappe/develop
revant Feb 21, 2021
c13228b
Merge pull request #436 from frappe/develop
revant Mar 6, 2021
7425f08
Merge pull request #440 from frappe/develop
revant Mar 22, 2021
9a78ae6
Merge pull request #443 from frappe/develop
revant Mar 26, 2021
8b97a7b
Merge pull request #450 from frappe/develop
revant Apr 2, 2021
b3c290e
Merge pull request #472 from frappe/develop
revant May 7, 2021
9d39e97
Merge pull request #477 from frappe/develop
revant May 21, 2021
99e5fee
Merge pull request #487 from frappe/develop
revant Jun 9, 2021
0186b9a
Merge pull request #491 from frappe/develop
revant Jun 22, 2021
6a907b8
Merge pull request #511 from frappe/develop
revant Aug 16, 2021
4016139
docs: update dev README for v13
revant Sep 15, 2021
90e9730
chore: devcontainer update
revant Sep 15, 2021
c149a93
Merge pull request #517 from revant/dev-docs
revant Sep 15, 2021
1cbb845
ci: Use GitHub Actions to build images
vrslev Oct 26, 2021
078a7f5
chore: Rename badge
vrslev Oct 27, 2021
a3cf159
ci: Uncomment for-production code
vrslev Oct 27, 2021
b181195
ci: Use base64 encoded helm deploy key
vrslev Oct 28, 2021
20a119d
Merge pull request #527 from vrslev/develop
revant Oct 29, 2021
7518c2d
chore(deps): bump actions/stale from 1 to 4
dependabot[bot] Oct 29, 2021
1daec15
ci(Build): Fix paths for PRs and branches
vrslev Oct 29, 2021
47b2d34
Merge pull request #530 from vrslev/fix-typo-in-gha-workflow
revant Oct 29, 2021
107f393
ci: fix base64 decode of env variable
revant Oct 29, 2021
4c79d6d
Merge pull request #531 from revant/fix-b64decode
revant Oct 29, 2021
7d36be5
ci: fixes ci steps
revant Oct 30, 2021
08a5429
Merge pull request #533 from revant/ci-fix-workflows
revant Oct 30, 2021
37b8cce
Merge pull request #528 from frappe/dependabot/github_actions/actions…
revant Oct 30, 2021
2da9c02
ci: Build fixes
vrslev Oct 31, 2021
63da01c
fix: Add missing packages for frappe:develop
dtwm Oct 28, 2021
33ec8ca
Merge pull request #537 from dtwm/develop
revant Nov 1, 2021
a4c115f
build: Update Python from 3.7 to 3.9; Debian from 10 to 11
vrslev Nov 3, 2021
e685dc5
Merge pull request #540 from vrslev/update-base-images
revant Nov 4, 2021
3c0f086
ci: Push images right after build
vrslev Nov 4, 2021
915885b
Merge pull request #542 from vrslev/push-images-instantly
revant Nov 4, 2021
de255d8
ci: Fix stable build
vrslev Nov 4, 2021
38c7f1e
Merge pull request #543 from vrslev/fix-build
vrslev Nov 4, 2021
d2b18a3
update
vrslev Nov 4, 2021
9fa3e1b
Merge branch 'main' into improve-tests-and-fix-builds
vrslev Nov 5, 2021
9a4aa8d
ci: Lint on PR
vrslev Nov 5, 2021
c808ad1
chore: Move files from build/common
vrslev Nov 5, 2021
a8ab724
Merge pull request #545 from vrslev/build-structure
revant Nov 6, 2021
8ad8471
Merge pull request #544 from vrslev/improve-tests-and-fix-builds
revant Nov 6, 2021
ce1ed54
update
vrslev Nov 6, 2021
daa1926
Revert "update"
vrslev Nov 6, 2021
089a2dc
build: Fix stable builds (#546)
vrslev Nov 6, 2021
de04eb0
build: Fix develop build
vrslev Nov 6, 2021
9d41a6d
Fix Python version for v12
vrslev Nov 6, 2021
457ecc5
fix(frappe-socketio): Remove dead `doctor` command
vrslev Nov 8, 2021
e4df6e5
refactor(worker): Replace basic commands with bench
vrslev Nov 8, 2021
5aa6e4e
Merge pull request #548 from vrslev/fix-socketio-cmd
revant Nov 8, 2021
d1ed880
ci(Dependabot): Add config for docker and npm
vrslev Nov 8, 2021
358293a
Merge pull request #549 from vrslev/refactor-worker-commands
revant Nov 8, 2021
f74f730
chore: Fix lint issues (#553)
vrslev Nov 9, 2021
fe47a4b
ci: Fix docker dependabot config
vrslev Nov 9, 2021
b57371e
chore: Add version constraint for lint action
vrslev Nov 9, 2021
5254e2a
fix: Improve CI, fix builds (#554)
vrslev Nov 9, 2021
a2db23e
fix(frappe-worker): Drop flags
vrslev Nov 9, 2021
5a38d66
chore: Fix linting
vrslev Nov 9, 2021
f0997db
Merge pull request #556 from vrslev/fix-drop-flags
revant Nov 9, 2021
7c157aa
refactor: Dockerfiles (#555)
vrslev Nov 9, 2021
2c97ffd
fix: ERPNext build (#558)
vrslev Nov 10, 2021
c0a4079
ci: fix git creds for helm release (#561)
revant Nov 10, 2021
6a8440b
ci: change git creds action for helm release
revant Nov 10, 2021
a355d8a
Merge pull request #563 from revant/gha-creds
revant Nov 10, 2021
cbf646b
ci: fix steps for helm release
revant Nov 10, 2021
02d8ce6
Merge pull request #564 from revant/gha-creds
revant Nov 10, 2021
d320db2
ci: use git command to config git creds
revant Nov 11, 2021
b7d990b
Merge pull request #566 from revant/gha-creds
revant Nov 11, 2021
ccc3fc2
Fix permission denied error
aynugek Nov 18, 2021
2fa61e9
Proposed changes to fix permission errors with mkdir
Nov 18, 2021
ef31d8e
feat(frappe-nginx): use nginxinc/nginx-unprivileged image
revant Nov 18, 2021
8634460
fix(frappe-nginx): create /assets dir
revant Nov 18, 2021
c04edf8
fix(frappe-nginx): install python2 for v12 builds
revant Nov 18, 2021
56c3341
Merge pull request #569 from Meradoch/patch-1
revant Nov 18, 2021
abe6d67
Merge pull request #570 from revant/unprivileged-nginx
Thunderbottom Nov 19, 2021
593dfe4
ci: fix erpnext build
revant Nov 19, 2021
9bfb3ab
ci: fix erpnext nginx build permissions
revant Nov 19, 2021
6b6a1b9
Merge pull request #572 from revant/fix-erpnext-build
revant Nov 19, 2021
3295c80
fix: change unpriviliged nginx port from 80 to 8080
revant Nov 21, 2021
318f651
ci: fix test volume permissions
revant Nov 21, 2021
cb2943b
ci: reload volume permissions
revant Nov 21, 2021
4f7108c
ci: check connections before curl
revant Nov 21, 2021
8fc3fbb
ci: fix lint
revant Nov 22, 2021
d68bcdc
ci: output erpnext-nginx container logs
revant Nov 22, 2021
7be2b2a
feat: added usage of secrets in image build
fahimalizain Nov 22, 2021
058c263
fix: GIT_REPO in worker dockerfile
fahimalizain Nov 22, 2021
9164829
ci: fix test and revert yamls
revant Nov 22, 2021
1427907
ci: revert shell script functions
revant Nov 22, 2021
e4ab694
Merge pull request #576 from revant/change-nginx-port
revant Nov 22, 2021
5a04589
Merge pull request #1 from frappe/main
yaacine Nov 22, 2021
ddbb7f1
Merge branch 'master' into sync-leam-fork
yaacine Nov 22, 2021
6e597bb
chore: leam frappe repo on the updated version of frappe_docker
yaacine Nov 22, 2021
5261890
Merge pull request #2 from yaacine/sync-leam-fork
yaacine Nov 22, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: daily

- package-ecosystem: docker
directory: build/bench
schedule:
interval: daily

- package-ecosystem: docker
directory: build/erpnext-nginx
schedule:
interval: daily

- package-ecosystem: docker
directory: build/erpnext-worker
schedule:
interval: daily

- package-ecosystem: docker
directory: build/frappe-nginx
schedule:
interval: daily

- package-ecosystem: docker
directory: build/frappe-socketio
schedule:
interval: daily

- package-ecosystem: docker
directory: build/frappe-worker
schedule:
interval: daily

- package-ecosystem: npm
directory: build/frappe-socketio
schedule:
interval: daily
20 changes: 20 additions & 0 deletions .github/scripts/get-latest-tags.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash

set -e
set -x

get_tag() {
tags=$(git ls-remote --refs --tags --sort='v:refname' "https://github.com/$1" "v$2.*")
tag=$(echo "$tags" | tail -n1 | sed 's/.*\///')
echo "$tag"
}

FRAPPE_VERSION=$(get_tag frappe/frappe "$VERSION")
ERPNEXT_VERSION=$(get_tag frappe/erpnext "$VERSION")

cat <<EOL >>"$GITHUB_ENV"
FRAPPE_VERSION=$FRAPPE_VERSION
ERPNEXT_VERSION=$ERPNEXT_VERSION
GIT_BRANCH=version-$VERSION
VERSION=$VERSION
EOL
127 changes: 127 additions & 0 deletions .github/workflows/build_develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
name: Build Develop

on:
pull_request:
branches:
- main
paths:
- .github/**
- build/**
- installation/**
- tests/**
- .dockerignore
- docker-bake.hcl
- docker-compose.yml
- env*

schedule:
# Every day at 12:00 pm
- cron: 0 0 * * *

workflow_dispatch:

env:
IS_AUTHORIZED_RUN: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}

jobs:
build_bench:
name: Bench
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup Buildx
uses: docker/setup-buildx-action@v1

- name: Login
uses: docker/login-action@v1
if: env.IS_AUTHORIZED_RUN == 'true'
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and test
uses: docker/[email protected]
with:
files: docker-bake.hcl
targets: bench-test

- name: Push
uses: docker/[email protected]
if: env.IS_AUTHORIZED_RUN == 'true'
with:
files: docker-bake.hcl
targets: bench-build
push: true

build_frappe:
name: Frappe
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup Buildx
uses: docker/setup-buildx-action@v1

- name: Login
uses: docker/login-action@v1
if: env.IS_AUTHORIZED_RUN == 'true'
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build
uses: docker/[email protected]
with:
files: docker-bake.hcl
targets: frappe-develop-test
load: true

- name: Test
run: ./tests/test-frappe.sh

- name: Push
if: env.IS_AUTHORIZED_RUN == 'true'
uses: docker/[email protected]
with:
files: docker-bake.hcl
targets: frappe-develop
push: true

build_erpnext:
name: ERPNext
runs-on: ubuntu-latest
needs: build_frappe
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup Buildx
uses: docker/setup-buildx-action@v1

- name: Login
uses: docker/login-action@v1
if: env.IS_AUTHORIZED_RUN == 'true'
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build
uses: docker/[email protected]
with:
files: docker-bake.hcl
targets: erpnext-develop-test
load: true

- name: Test
run: FRAPPE_VERSION=develop ./tests/test-erpnext.sh

- name: Push
if: env.IS_AUTHORIZED_RUN == 'true'
uses: docker/[email protected]
with:
files: docker-bake.hcl
targets: erpnext-develop
push: true
146 changes: 146 additions & 0 deletions .github/workflows/build_stable.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
name: Build Stable

on:
pull_request:
branches:
- main
paths:
- .github/**
- build/**
- installation/**
- tests/**
- .dockerignore
- docker-bake.hcl
- docker-compose.yml
- env*
push:
branches:
- main
paths:
- .github/**
- build/**
- installation/**
- tests/**
- .dockerignore
- docker-bake.hcl
- docker-compose.yml
- env*

# Triggered from frappe/frappe and frappe/erpnext on releases
repository_dispatch:

workflow_dispatch:

env:
IS_AUTHORIZED_RUN: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}

jobs:
build_frappe:
name: Frappe
runs-on: ubuntu-latest
strategy:
matrix:
version: [12, 13]

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup Buildx
uses: docker/setup-buildx-action@v1

- name: Login
uses: docker/login-action@v1
if: env.IS_AUTHORIZED_RUN == 'true'
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Get latest versions
run: ./.github/scripts/get-latest-tags.sh
env:
VERSION: ${{ matrix.version }}

- name: Build
uses: docker/[email protected]
with:
files: docker-bake.hcl
targets: frappe-stable-test
load: true

- name: Push
if: env.IS_AUTHORIZED_RUN == 'true'
uses: docker/[email protected]
with:
files: docker-bake.hcl
targets: frappe-stable
push: true
env:
GIT_TAG: ${{ env.FRAPPE_VERSION }}

build_erpnext:
name: ERPNext
runs-on: ubuntu-latest
needs: build_frappe
strategy:
matrix:
version: [12, 13]

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup Buildx
uses: docker/setup-buildx-action@v1

- name: Login
uses: docker/login-action@v1
if: env.IS_AUTHORIZED_RUN == 'true'
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Get latest versions
run: ./.github/scripts/get-latest-tags.sh
env:
VERSION: ${{ matrix.version }}

- name: Build
uses: docker/[email protected]
with:
files: docker-bake.hcl
targets: erpnext-stable-test
load: true

- name: Push
if: env.IS_AUTHORIZED_RUN == 'true'
uses: docker/[email protected]
with:
files: docker-bake.hcl
targets: erpnext-stable
push: true
env:
GIT_TAG: ${{ env.ERPNEXT_VERSION }}

release_helm:
name: Release Helm
runs-on: ubuntu-latest
if: github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request'
needs: [build_frappe, build_erpnext]

steps:
- name: Setup deploy key
uses: webfactory/[email protected]
with:
ssh-private-key: ${{ secrets.HELM_DEPLOY_KEY }}

- name: Setup Git Credentials
run: |
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"

- name: Release
run: |
git clone [email protected]:frappe/helm.git && cd helm
pip install -r release_wizard/requirements.txt
./release_wizard/wizard 13 patch --remote origin --ci
18 changes: 18 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Lint

on:
push:
branches:
- main
pull_request:
branches:
- main

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ludeeus/[email protected]
env:
SHELLCHECK_OPTS: -x
19 changes: 9 additions & 10 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@ name: Mark stale issues and pull requests

on:
schedule:
- cron: "0 0 * * *"
# Every day at 12:00 pm
- cron: 0 0 * * *

jobs:
stale:

runs-on: ubuntu-latest

steps:
- uses: actions/stale@v1
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.'
stale-pr-message: 'This PR has been automatically marked as stale. You have a week to explain why you believe this is an error.'
stale-issue-label: 'no-issue-activity'
stale-pr-label: 'no-pr-activity'
- uses: actions/stale@v4
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.
stale-pr-message: This PR has been automatically marked as stale. You have a week to explain why you believe this is an error.
stale-issue-label: no-issue-activity
stale-pr-label: no-pr-activity
Loading