fix: resolve travis yml conflicts

use travis.py

build/erpnext-nginx/Dockerfile

@@ -30,7 +30,7 @@ FROM nginx:latest
 COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
 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/erpnext-assets/docker-entrypoint.sh /
+COPY build/erpnext-nginx/docker-entrypoint.sh /
 
 RUN apt-get update && apt-get install -y rsync && apt-get clean
 

build/erpnext-nginx/v11.Dockerfile

@@ -30,7 +30,7 @@ FROM nginx:latest
 COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
 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/erpnext-assets/docker-entrypoint.sh /
+COPY build/erpnext-nginx/docker-entrypoint.sh /
 
 RUN apt-get update && apt-get install -y rsync && apt-get clean
 

build/erpnext-nginx/v12.Dockerfile

@@ -30,7 +30,7 @@ FROM nginx:latest
 COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
 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/erpnext-assets/docker-entrypoint.sh /
+COPY build/erpnext-nginx/docker-entrypoint.sh /
 
 RUN apt-get update && apt-get install -y rsync && apt-get clean
 

build/frappe-nginx/Dockerfile

@@ -27,7 +27,7 @@ FROM nginx:latest
 COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
 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/frappe-assets/docker-entrypoint.sh /
+COPY build/frappe-nginx/docker-entrypoint.sh /
 
 RUN apt-get update && apt-get install -y rsync && apt-get clean
 

build/frappe-nginx/v11.Dockerfile

@@ -27,7 +27,7 @@ FROM nginx:latest
 COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
 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/frappe-assets/docker-entrypoint.sh /
+COPY build/frappe-nginx/docker-entrypoint.sh /
 
 RUN apt-get update && apt-get install -y rsync && apt-get clean
 

build/frappe-nginx/v12.Dockerfile

@@ -27,7 +27,7 @@ FROM nginx:latest
 COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/
 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/frappe-assets/docker-entrypoint.sh /
+COPY build/frappe-nginx/docker-entrypoint.sh /
 
 RUN apt-get update && apt-get install -y rsync && apt-get clean
 

installation/docker-compose-erpnext.yml

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

installation/docker-compose-frappe.yml

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