mirror of
https://github.com/frappe/frappe_docker.git
synced 2024-12-23 18:48:58 +00:00
chore: Move files from build/common
This commit is contained in:
parent
915885bb05
commit
c808ad1767
@ -48,7 +48,7 @@ RUN mkdir -p /home/frappe/frappe-bench/sites/assets/frappe/ \
|
||||
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-nginx/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
|
||||
COPY build/frappe-nginx/docker-entrypoint.sh /
|
||||
|
||||
RUN apt-get update && apt-get install -y rsync && apt-get clean \
|
||||
|
@ -60,7 +60,7 @@ RUN apt-get update -y && apt-get install \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Setup docker-entrypoint
|
||||
COPY build/common/worker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
|
||||
COPY build/frappe-worker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
|
||||
RUN ln -s /usr/local/bin/docker-entrypoint.sh / # backwards compat
|
||||
|
||||
USER frappe
|
||||
@ -84,11 +84,11 @@ RUN python -m venv env \
|
||||
&& pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/frappe
|
||||
|
||||
# Copy scripts and templates
|
||||
COPY build/common/commands/* /home/frappe/frappe-bench/commands/
|
||||
COPY build/common/common_site_config.json.template /opt/frappe/common_site_config.json.template
|
||||
COPY build/common/worker/install_app.sh /usr/local/bin/install_app
|
||||
COPY build/common/worker/bench /usr/local/bin/bench
|
||||
COPY build/common/worker/healthcheck.sh /usr/local/bin/healthcheck.sh
|
||||
COPY build/frappe-worker/commands/* /home/frappe/frappe-bench/commands/
|
||||
COPY build/frappe-worker/common_site_config.json.template /opt/frappe/common_site_config.json.template
|
||||
COPY build/frappe-worker/install_app.sh /usr/local/bin/install_app
|
||||
COPY build/frappe-worker/bench /usr/local/bin/bench
|
||||
COPY build/frappe-worker/healthcheck.sh /usr/local/bin/healthcheck.sh
|
||||
|
||||
# Use sites volume as working directory
|
||||
WORKDIR /home/frappe/frappe-bench/sites
|
||||
|
Loading…
Reference in New Issue
Block a user