mirror of
https://github.com/frappe/frappe_docker.git
synced 2025-01-26 00:28:24 +00:00
Merge pull request #260 from frappe/develop
Release Frappe Framework v12.6.2 and ERPNext v12.9.4
This commit is contained in:
commit
0489fae441
@ -23,9 +23,10 @@ services:
|
|||||||
command: sleep infinity
|
command: sleep infinity
|
||||||
volumes:
|
volumes:
|
||||||
- ..:/workspace:cached
|
- ..:/workspace:cached
|
||||||
|
working_dir: /workspace/development
|
||||||
ports:
|
ports:
|
||||||
- "8000:8000"
|
- "8000-8005:8000-8005"
|
||||||
- "9000:9000"
|
- "9000-9005:9000-9005"
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
mariadb-vol:
|
mariadb-vol:
|
||||||
|
@ -113,4 +113,4 @@ RUN bash -c "node --version" \
|
|||||||
&& bash -c "npm --version" \
|
&& bash -c "npm --version" \
|
||||||
&& bash -c "yarn --version"
|
&& bash -c "yarn --version"
|
||||||
|
|
||||||
EXPOSE 8000 9000 6787
|
EXPOSE 8000-8005 9000-9005 6787
|
||||||
|
@ -125,7 +125,8 @@ elif [ "$1" = 'schedule' ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
elif [ "$1" = 'new' ]; then
|
elif [ "$1" = 'new' ]; then
|
||||||
|
checkConfigExists
|
||||||
|
checkConnection
|
||||||
if [[ -z "$RUN_AS_ROOT" ]]; then
|
if [[ -z "$RUN_AS_ROOT" ]]; then
|
||||||
su frappe -c ". /home/frappe/frappe-bench/env/bin/activate \
|
su frappe -c ". /home/frappe/frappe-bench/env/bin/activate \
|
||||||
&& python /home/frappe/frappe-bench/commands/new.py"
|
&& python /home/frappe/frappe-bench/commands/new.py"
|
||||||
|
@ -11,7 +11,7 @@ In order to start developing you need to satisfy the following prerequisites:
|
|||||||
It is recommended you allocate at least 4GB of RAM to docker:
|
It is recommended you allocate at least 4GB of RAM to docker:
|
||||||
|
|
||||||
- [Instructions for Windows](https://docs.docker.com/docker-for-windows/#resources)
|
- [Instructions for Windows](https://docs.docker.com/docker-for-windows/#resources)
|
||||||
- [Instructions for MacOOS](https://docs.docker.com/docker-for-mac/#resources)
|
- [Instructions for macOS](https://docs.docker.com/docker-for-mac/#resources)
|
||||||
|
|
||||||
## Bootstrap Containers for development
|
## Bootstrap Containers for development
|
||||||
|
|
||||||
@ -30,8 +30,8 @@ VSCode should automatically inquire you to install the required extensions, that
|
|||||||
|
|
||||||
- Install Remote - Containers for VSCode
|
- Install Remote - Containers for VSCode
|
||||||
- through command line `code --install-extension ms-vscode-remote.remote-containers`
|
- through command line `code --install-extension ms-vscode-remote.remote-containers`
|
||||||
- clicking on the button at the following link: [Remote - Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers)
|
- clicking on the Install button in the Vistual Studio Marketplace: [Remote - Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers)
|
||||||
- searching for extension `ms-vscode-remote.remote-containers`
|
- View: Extensions command in VSCode (Windows: Ctrl+Shift+X; macOS: Cmd+Shift+X) then search for extension `ms-vscode-remote.remote-containers`
|
||||||
|
|
||||||
After the extensions are installed, you can:
|
After the extensions are installed, you can:
|
||||||
|
|
||||||
@ -244,6 +244,7 @@ EXIT;
|
|||||||
|
|
||||||
In case you don't use VSCode, you may start the containers manually with the following command:
|
In case you don't use VSCode, you may start the containers manually with the following command:
|
||||||
|
|
||||||
|
### Running the containers
|
||||||
```shell
|
```shell
|
||||||
docker-compose -f .devcontainer/docker-compose.yml up -d
|
docker-compose -f .devcontainer/docker-compose.yml up -d
|
||||||
```
|
```
|
||||||
|
Loading…
x
Reference in New Issue
Block a user