diff --git a/build/erpnext-nginx/Dockerfile b/build/erpnext-nginx/Dockerfile index 1e25becf..847e23f0 100644 --- a/build/erpnext-nginx/Dockerfile +++ b/build/erpnext-nginx/Dockerfile @@ -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} diff --git a/build/erpnext-worker/Dockerfile b/build/erpnext-worker/Dockerfile index a475bbe5..07fea7a5 100644 --- a/build/erpnext-worker/Dockerfile +++ b/build/erpnext-worker/Dockerfile @@ -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} diff --git a/build/frappe-nginx/Dockerfile b/build/frappe-nginx/Dockerfile index f25388ab..255bc368 100644 --- a/build/frappe-nginx/Dockerfile +++ b/build/frappe-nginx/Dockerfile @@ -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 diff --git a/build/frappe-socketio/Dockerfile b/build/frappe-socketio/Dockerfile index 34db1472..8eb22924 100644 --- a/build/frappe-socketio/Dockerfile +++ b/build/frappe-socketio/Dockerfile @@ -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" \ diff --git a/build/frappe-worker/Dockerfile b/build/frappe-worker/Dockerfile index 906b5273..680ff1b0 100644 --- a/build/frappe-worker/Dockerfile +++ b/build/frappe-worker/Dockerfile @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index 96a22503..18ec1cae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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}