mirror of
https://github.com/frappe/frappe_docker.git
synced 2026-06-26 09:05:10 +00:00
Corretto accapo win per linux CRLF to LF
This commit is contained in:
parent
08c8fcb85c
commit
7c38bbbdde
6 changed files with 6 additions and 6 deletions
|
|
@ -1,5 +1,5 @@
|
|||
ARG NODE_IMAGE_TAG=12-buster-slim
|
||||
ARG GIT_BRANCH=develop
|
||||
ARG GIT_BRANCH=version-12
|
||||
ARG DOCKER_REGISTRY_PREFIX=graficheaquilane
|
||||
FROM node:${NODE_IMAGE_TAG}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ARG GIT_BRANCH=develop
|
||||
ARG GIT_BRANCH=version-12
|
||||
ARG DOCKER_REGISTRY_PREFIX=graficheaquilane
|
||||
FROM ${DOCKER_REGISTRY_PREFIX}/frappe-worker:${GIT_BRANCH}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ WORKDIR /home/frappe/frappe-bench
|
|||
RUN mkdir -p /home/frappe/frappe-bench/sites \
|
||||
&& 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 \
|
||||
&& cd apps \
|
||||
&& git clone --depth 1 https://github.com/GraficheAquilane2021/frappe --branch $GIT_BRANCH
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ RUN mkdir -p /home/frappe/frappe-bench/sites /home/frappe/frappe-bench/apps/frap
|
|||
|
||||
# Download socketio and purge curl package
|
||||
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 \
|
||||
&& cd /home/frappe/frappe-bench/apps/frappe \
|
||||
&& curl "https://raw.githubusercontent.com/GraficheAquilane2021/frappe/$GIT_BRANCH/socketio.js" \
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ FROM python:3.7-slim-buster
|
|||
# Add non root user without password
|
||||
RUN useradd -ms /bin/bash frappe
|
||||
|
||||
ARG GIT_BRANCH=develop
|
||||
ARG GIT_BRANCH=version-12
|
||||
ARG ARCH=amd64
|
||||
ENV PYTHONUNBUFFERED 1
|
||||
ENV NVM_DIR=/home/frappe/.nvm
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ services:
|
|||
- redis-socketio-vol:/data
|
||||
|
||||
mariadb:
|
||||
image: mariadb:10.3
|
||||
image: graficheaquilane/mariadb:10.3
|
||||
restart: on-failure
|
||||
environment:
|
||||
- MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
|
||||
|
|
|
|||
Loading…
Reference in a new issue