accounting/frappe_docker
2
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-12-23 18:48:58 +00:00
Code Issues Releases Activity

Merge pull request #112 from revant/fix-rename-frappe-assets-conflicts

Browse Source 
rename frappe assets
This commit is contained in:
Revant Nandgaonkar 2020-03-05 12:14:46 +05:30 committed by GitHub
commit 02d2b9fbbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/erpnext-assets/Dockerfile → build/erpnext-nginx/Dockerfile
View File

@ -30,7 +30,7 @@ FROM nginx:latest
COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/ COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
COPY --from=0 /var/www/error_pages /var/www/ COPY --from=0 /var/www/error_pages /var/www/
COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
COPY build/erpnext-assets/docker-entrypoint.sh / COPY build/erpnext-nginx/docker-entrypoint.sh /
RUN apt-get update && apt-get install -y rsync && apt-get clean RUN apt-get update && apt-get install -y rsync && apt-get clean

0
build/erpnext-assets/docker-entrypoint.sh → build/erpnext-nginx/docker-entrypoint.sh
View File

2
build/erpnext-assets/v11.Dockerfile → build/erpnext-nginx/v11.Dockerfile
View File

@ -30,7 +30,7 @@ FROM nginx:latest
COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/ COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
COPY --from=0 /var/www/error_pages /var/www/ COPY --from=0 /var/www/error_pages /var/www/
COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
COPY build/erpnext-assets/docker-entrypoint.sh / COPY build/erpnext-nginx/docker-entrypoint.sh /
RUN apt-get update && apt-get install -y rsync && apt-get clean RUN apt-get update && apt-get install -y rsync && apt-get clean

2
build/erpnext-assets/v12.Dockerfile → build/erpnext-nginx/v12.Dockerfile
View File

@ -30,7 +30,7 @@ FROM nginx:latest
COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/ COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
COPY --from=0 /var/www/error_pages /var/www/ COPY --from=0 /var/www/error_pages /var/www/
COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
COPY build/erpnext-assets/docker-entrypoint.sh / COPY build/erpnext-nginx/docker-entrypoint.sh /
RUN apt-get update && apt-get install -y rsync && apt-get clean RUN apt-get update && apt-get install -y rsync && apt-get clean

2
build/frappe-assets/Dockerfile → build/frappe-nginx/Dockerfile
View File

@ -27,7 +27,7 @@ FROM nginx:latest
COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/ COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
COPY --from=0 /var/www/error_pages /var/www/ COPY --from=0 /var/www/error_pages /var/www/
COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
COPY build/frappe-assets/docker-entrypoint.sh / COPY build/frappe-nginx/docker-entrypoint.sh /
RUN apt-get update && apt-get install -y rsync && apt-get clean RUN apt-get update && apt-get install -y rsync && apt-get clean

0
build/frappe-assets/docker-entrypoint.sh → build/frappe-nginx/docker-entrypoint.sh
View File

2
build/frappe-assets/v11.Dockerfile → build/frappe-nginx/v11.Dockerfile
View File

@ -27,7 +27,7 @@ FROM nginx:latest
COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/ COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
COPY --from=0 /var/www/error_pages /var/www/ COPY --from=0 /var/www/error_pages /var/www/
COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
COPY build/frappe-assets/docker-entrypoint.sh / COPY build/frappe-nginx/docker-entrypoint.sh /
RUN apt-get update && apt-get install -y rsync && apt-get clean RUN apt-get update && apt-get install -y rsync && apt-get clean

2
build/frappe-assets/v12.Dockerfile → build/frappe-nginx/v12.Dockerfile
View File

@ -27,7 +27,7 @@ FROM nginx:latest
COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/ COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
COPY --from=0 /var/www/error_pages /var/www/ COPY --from=0 /var/www/error_pages /var/www/
COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
COPY build/frappe-assets/docker-entrypoint.sh / COPY build/frappe-nginx/docker-entrypoint.sh /
RUN apt-get update && apt-get install -y rsync && apt-get clean RUN apt-get update && apt-get install -y rsync && apt-get clean

4
installation/docker-compose-erpnext.yml
View File

@ -1,8 +1,8 @@
version: '3' version: '3'
services: services:
erpnext-assets: erpnext-nginx:
image: frappe/erpnext-assets:${VERSION} image: frappe/erpnext-nginx:${VERSION}
restart: on-failure restart: on-failure
environment: environment:
- FRAPPE_PY=erpnext-python - FRAPPE_PY=erpnext-python

4
installation/docker-compose-frappe.yml
View File

@ -1,8 +1,8 @@
version: '3' version: '3'
services: services:
frappe-assets: frappe-nginx:
image: frappe/frappe-assets:${VERSION} image: frappe/frappe-nginx:${VERSION}
restart: on-failure restart: on-failure
environment: environment:
- FRAPPE_PY=frappe-python - FRAPPE_PY=frappe-python