epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-26 09:05:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Corretto accapo win per linux CRLF to LF

Browse source
This commit is contained in:
GraficheAquilane2021 2021-02-04 12:55:09 +01:00
parent 08c8fcb85c
commit 7c38bbbdde
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/erpnext-nginx/Dockerfile
View file

@ -1,5 +1,5 @@
ARG NODE_IMAGE_TAG=12-buster-slim ARG NODE_IMAGE_TAG=12-buster-slim
ARG GIT_BRANCH=develop ARG GIT_BRANCH=version-12
ARG DOCKER_REGISTRY_PREFIX=graficheaquilane ARG DOCKER_REGISTRY_PREFIX=graficheaquilane
FROM node:${NODE_IMAGE_TAG} FROM node:${NODE_IMAGE_TAG}

2
build/erpnext-worker/Dockerfile
View file

@ -1,4 +1,4 @@
ARG GIT_BRANCH=develop ARG GIT_BRANCH=version-12
ARG DOCKER_REGISTRY_PREFIX=graficheaquilane ARG DOCKER_REGISTRY_PREFIX=graficheaquilane
FROM ${DOCKER_REGISTRY_PREFIX}/frappe-worker:${GIT_BRANCH} FROM ${DOCKER_REGISTRY_PREFIX}/frappe-worker:${GIT_BRANCH}

2
build/frappe-nginx/Dockerfile
View file

@ -21,7 +21,7 @@ WORKDIR /home/frappe/frappe-bench
RUN mkdir -p /home/frappe/frappe-bench/sites \ RUN mkdir -p /home/frappe/frappe-bench/sites \
&& echo "frappe" > /home/frappe/frappe-bench/sites/apps.txt && echo "frappe" > /home/frappe/frappe-bench/sites/apps.txt
ARG GIT_BRANCH=develop ARG GIT_BRANCH=version-12
RUN mkdir -p apps sites/assets/css \ RUN mkdir -p apps sites/assets/css \
&& cd apps \ && cd apps \
&& git clone --depth 1 https://github.com/GraficheAquilane2021/frappe --branch $GIT_BRANCH && git clone --depth 1 https://github.com/GraficheAquilane2021/frappe --branch $GIT_BRANCH

2
build/frappe-socketio/Dockerfile
View file

@ -9,7 +9,7 @@ RUN mkdir -p /home/frappe/frappe-bench/sites /home/frappe/frappe-bench/apps/frap
# Download socketio and purge curl package # Download socketio and purge curl package
COPY build/frappe-socketio/package.json /home/frappe/frappe-bench/apps/frappe COPY build/frappe-socketio/package.json /home/frappe/frappe-bench/apps/frappe
ARG GIT_BRANCH=develop ARG GIT_BRANCH=version-12
RUN apt-get update && apt-get install -y curl \ RUN apt-get update && apt-get install -y curl \
&& cd /home/frappe/frappe-bench/apps/frappe \ && cd /home/frappe/frappe-bench/apps/frappe \
&& curl "https://raw.githubusercontent.com/GraficheAquilane2021/frappe/$GIT_BRANCH/socketio.js" \ && curl "https://raw.githubusercontent.com/GraficheAquilane2021/frappe/$GIT_BRANCH/socketio.js" \

2
build/frappe-worker/Dockerfile
View file

@ -3,7 +3,7 @@ FROM python:3.7-slim-buster
# Add non root user without password # Add non root user without password
RUN useradd -ms /bin/bash frappe RUN useradd -ms /bin/bash frappe
ARG GIT_BRANCH=develop ARG GIT_BRANCH=version-12
ARG ARCH=amd64 ARG ARCH=amd64
ENV PYTHONUNBUFFERED 1 ENV PYTHONUNBUFFERED 1
ENV NVM_DIR=/home/frappe/.nvm ENV NVM_DIR=/home/frappe/.nvm

2
docker-compose.yml
View file

@ -132,7 +132,7 @@ services:
- redis-socketio-vol:/data - redis-socketio-vol:/data
mariadb: mariadb:
image: mariadb:10.3 image: graficheaquilane/mariadb:10.3
restart: on-failure restart: on-failure
environment: environment:
- MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}