Compare commits
3 Commits
main
...
compat-202
Author | SHA1 | Date | |
---|---|---|---|
|
6bc8b4041b | ||
|
3c77d58e59 | ||
|
aab7c0cee6 |
@ -20,7 +20,10 @@ COPY --chown=frappe:frappe . apps/${APP_NAME}
|
|||||||
RUN bench setup requirements
|
RUN bench setup requirements
|
||||||
|
|
||||||
# Build static assets, copy files instead of symlink
|
# Build static assets, copy files instead of symlink
|
||||||
RUN bench build --production --verbose --hard-link
|
RUN if [ -z "${ERPNEXT_VERSION##*v14*}" ] || [ "$ERPNEXT_VERSION" = "develop" ]; then \
|
||||||
|
export BUILD_OPTS="--production"; \
|
||||||
|
fi \
|
||||||
|
&& FRAPPE_ENV=production bench build --verbose --hard-link ${BUILD_OPTS}
|
||||||
|
|
||||||
|
|
||||||
# Use frappe-nginx image with nginx template and env vars
|
# Use frappe-nginx image with nginx template and env vars
|
||||||
|
@ -73,8 +73,8 @@ target "default-args" {
|
|||||||
BENCH_REPO = "${BENCH_REPO}"
|
BENCH_REPO = "${BENCH_REPO}"
|
||||||
FRAPPE_VERSION = "${FRAPPE_VERSION}"
|
FRAPPE_VERSION = "${FRAPPE_VERSION}"
|
||||||
ERPNEXT_VERSION = "${ERPNEXT_VERSION}"
|
ERPNEXT_VERSION = "${ERPNEXT_VERSION}"
|
||||||
PYTHON_VERSION = can(regex("v13", "${ERPNEXT_VERSION}")) ? "3.9.9" : "3.10.5"
|
PYTHON_VERSION = can(regex("v13", "${ERPNEXT_VERSION}")) ? "3.9.17" : "3.10.12"
|
||||||
NODE_VERSION = can(regex("v13", "${FRAPPE_VERSION}")) ? "14.19.3" : "16.18.0"
|
NODE_VERSION = can(regex("v13", "${FRAPPE_VERSION}")) ? "14.21.3" : "16.20.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ server {
|
|||||||
|
|
||||||
location ~ ^/protected/(.*) {
|
location ~ ^/protected/(.*) {
|
||||||
internal;
|
internal;
|
||||||
try_files /sites/$http_host/$1 =404;
|
try_files /sites/${FRAPPE_SITE_NAME_HEADER}/$1 =404;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /socket.io {
|
location /socket.io {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user