produzione indipendente da dipendenze esterne

This commit is contained in:
GraficheAquilane2021 2021-02-02 15:23:37 +01:00
parent 7b28abf877
commit f6b26fc7bc
14 changed files with 39 additions and 38 deletions

View file

@ -153,7 +153,7 @@ jobs:
- stage: "Build and test edge images" - stage: "Build and test edge images"
if: type = pull_request if: type = pull_request
before_install: before_install:
- sudo curl -L "https://github.com/docker/compose/releases/download/1.26.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose - sudo curl -L "https://github.com/ GraficheAquilane2021/compose/releases/download/1.26.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
- sudo chmod +x /usr/local/bin/docker-compose - sudo chmod +x /usr/local/bin/docker-compose
- sudo ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose - sudo ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose
- sudo apt-get update && sudo apt-get -y install w3m - sudo apt-get update && sudo apt-get -y install w3m

View file

@ -89,7 +89,7 @@ ENV NODE_VERSION=12.20.0
ENV NODE_VERSION_FRAPPEV11=10.23.0 ENV NODE_VERSION_FRAPPEV11=10.23.0
# Install nvm with node # Install nvm with node
RUN wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh RUN wget https://raw.githubusercontent.com/GraficheAquilane2021/nvm/v0.35.3/install.sh
RUN chmod +x install.sh RUN chmod +x install.sh
RUN ./install.sh RUN ./install.sh
ENV NVM_DIR=/home/frappe/.nvm ENV NVM_DIR=/home/frappe/.nvm

View file

@ -1,13 +1,13 @@
ARG NODE_IMAGE_TAG=12-prod ARG NODE_IMAGE_TAG=12-prod
ARG GIT_BRANCH=develop ARG GIT_BRANCH=develop
FROM bitnami/node:${NODE_IMAGE_TAG} FROM graficheaquilane/node:${NODE_IMAGE_TAG}
ARG GIT_BRANCH ARG GIT_BRANCH
COPY build/erpnext-nginx/install_app.sh /install_app COPY build/erpnext-nginx/install_app.sh /install_app
RUN /install_app erpnext https://github.com/frappe/erpnext ${GIT_BRANCH} RUN /install_app erpnext https://github.com/GraficheAquilane2021/erpnext ${GIT_BRANCH}
FROM frappe/frappe-nginx:${GIT_BRANCH} FROM graficheaquilane/frappe-nginx:${GIT_BRANCH}
COPY --from=0 /home/frappe/frappe-bench/sites/ /var/www/html/ COPY --from=0 /home/frappe/frappe-bench/sites/ /var/www/html/
COPY --from=0 /rsync /rsync COPY --from=0 /rsync /rsync

View file

@ -14,7 +14,7 @@ install_packages git python2
mkdir -p apps mkdir -p apps
cd apps cd apps
git clone --depth 1 https://github.com/frappe/frappe ${BRANCH} git clone --depth 1 https://github.com/GraficheAquilane2021/frappe ${BRANCH}
git clone --depth 1 ${APP_REPO} ${BRANCH} ${APP_NAME} git clone --depth 1 ${APP_REPO} ${BRANCH} ${APP_NAME}
cd /home/frappe/frappe-bench/apps/frappe cd /home/frappe/frappe-bench/apps/frappe

View file

@ -1,5 +1,5 @@
ARG GIT_BRANCH=develop ARG GIT_BRANCH=develop
FROM frappe/frappe-worker:${GIT_BRANCH} FROM graficheaquilane/frappe-worker:${GIT_BRANCH}
ARG GIT_BRANCH ARG GIT_BRANCH
RUN install_app erpnext https://github.com/frappe/erpnext ${GIT_BRANCH} RUN install_app erpnext https://github.com/GraficheAquilane2021/erpnext ${GIT_BRANCH}

View file

@ -2,13 +2,13 @@
# This is done to ensures that node-sass binary remains common. # This is done to ensures that node-sass binary remains common.
# node-sass is required to enable website theme feature used # node-sass is required to enable website theme feature used
# by Website Manager role in Frappe Framework # by Website Manager role in Frappe Framework
FROM bitnami/python:3.7-prod FROM graficheaquilane/python:3.7-prod
ENV NVM_DIR=/root/.nvm ENV NVM_DIR=/root/.nvm
ENV NODE_VERSION=12.20.0 ENV NODE_VERSION=12.20.0
ENV PATH="/root/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}" ENV PATH="/root/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}"
RUN install_packages wget \ RUN install_packages wget \
&& wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh \ && wget https://raw.githubusercontent.com/GraficheAquilane2021/nvm/v0.35.3/install.sh \
&& chmod +x install.sh \ && chmod +x install.sh \
&& ./install.sh \ && ./install.sh \
&& . "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION} \ && . "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION} \
@ -23,7 +23,7 @@ RUN install_packages git
ARG GIT_BRANCH=develop ARG GIT_BRANCH=develop
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/frappe/frappe --branch $GIT_BRANCH && git clone --depth 1 https://github.com/GraficheAquilane2021/frappe --branch $GIT_BRANCH
RUN cd /home/frappe/frappe-bench/apps/frappe \ RUN cd /home/frappe/frappe-bench/apps/frappe \
&& yarn \ && yarn \
@ -35,7 +35,7 @@ RUN node --version \
&& npm --version \ && npm --version \
&& yarn --version && yarn --version
RUN git clone --depth 1 https://github.com/frappe/bench /tmp/bench \ RUN git clone --depth 1 https://github.com/GraficheAquilane2021/bench /tmp/bench \
&& mkdir -p /var/www/error_pages \ && mkdir -p /var/www/error_pages \
&& cp -r /tmp/bench/bench/config/templates /var/www/error_pages && cp -r /tmp/bench/bench/config/templates /var/www/error_pages

View file

@ -1,4 +1,4 @@
FROM node:slim FROM graficheaquilane/node:slim
# Add frappe user # Add frappe user
RUN useradd -ms /bin/bash frappe RUN useradd -ms /bin/bash frappe
@ -12,9 +12,9 @@ COPY build/frappe-socketio/package.json /home/frappe/frappe-bench/apps/frappe
ARG GIT_BRANCH=develop ARG GIT_BRANCH=develop
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/frappe/frappe/$GIT_BRANCH/socketio.js" \ && curl "https://raw.githubusercontent.com/GraficheAquilane2021/frappe/$GIT_BRANCH/socketio.js" \
--output /home/frappe/frappe-bench/apps/frappe/socketio.js \ --output /home/frappe/frappe-bench/apps/frappe/socketio.js \
&& curl "https://raw.githubusercontent.com/frappe/frappe/$GIT_BRANCH/node_utils.js" \ && curl "https://raw.githubusercontent.com/GraficheAquilane2021/frappe/$GIT_BRANCH/node_utils.js" \
--output /home/frappe/frappe-bench/apps/frappe/node_utils.js \ --output /home/frappe/frappe-bench/apps/frappe/node_utils.js \
&& apt-get purge -y curl && apt-get autoremove -y \ && apt-get purge -y curl && apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

View file

@ -1,4 +1,5 @@
FROM bitnami/python:3.7-prod FROM graficheaquilane/python:3.7-prod
# Add non root user without password # Add non root user without password
RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS -1/' /etc/login.defs \ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS -1/' /etc/login.defs \
@ -34,7 +35,7 @@ RUN install_packages \
wait-for-it \ wait-for-it \
&& wget https://github.com/GraficheAquilane2021/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_amd64.deb \ && wget https://github.com/GraficheAquilane2021/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_amd64.deb \
&& dpkg -i wkhtmltox_0.12.5-1.buster_amd64.deb && rm wkhtmltox_0.12.5-1.buster_amd64.deb \ && dpkg -i wkhtmltox_0.12.5-1.buster_amd64.deb && rm wkhtmltox_0.12.5-1.buster_amd64.deb \
&& wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh \ && wget https://raw.githubusercontent.com/GraficheAquilane2021/nvm/v0.35.3/install.sh \
&& apt-get purge -y wget && apt-get autoremove -y \ && apt-get purge -y wget && apt-get autoremove -y \
&& chown -R frappe:frappe /home/frappe && chown -R frappe:frappe /home/frappe

View file

@ -2,7 +2,7 @@ version: "3"
services: services:
traefik: traefik:
image: "traefik:v2.2" image: "graficheaquilane/traefik:v2.2"
command: command:
- "--log.level=DEBUG" - "--log.level=DEBUG"
- "--providers.docker=true" - "--providers.docker=true"
@ -30,7 +30,7 @@ services:
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:ro
erpnext-nginx: erpnext-nginx:
image: frappe/erpnext-nginx:${ERPNEXT_VERSION} image: graficheaquilane/erpnext-nginx:${ERPNEXT_VERSION}
restart: on-failure restart: on-failure
environment: environment:
- FRAPPE_PY=erpnext-python - FRAPPE_PY=erpnext-python
@ -48,7 +48,7 @@ services:
- assets-vol:/assets:rw - assets-vol:/assets:rw
erpnext-python: erpnext-python:
image: frappe/erpnext-worker:${ERPNEXT_VERSION} image: graficheaquilane/erpnext-worker:${ERPNEXT_VERSION}
restart: on-failure restart: on-failure
environment: environment:
- MARIADB_HOST=${MARIADB_HOST} - MARIADB_HOST=${MARIADB_HOST}
@ -62,7 +62,7 @@ services:
- assets-vol:/home/frappe/frappe-bench/sites/assets:rw - assets-vol:/home/frappe/frappe-bench/sites/assets:rw
frappe-socketio: frappe-socketio:
image: frappe/frappe-socketio:${FRAPPE_VERSION} image: graficheaquilane/frappe-socketio:${FRAPPE_VERSION}
restart: on-failure restart: on-failure
depends_on: depends_on:
- redis-socketio - redis-socketio
@ -70,7 +70,7 @@ services:
- sites-vol:/home/frappe/frappe-bench/sites:rw - sites-vol:/home/frappe/frappe-bench/sites:rw
erpnext-worker-default: erpnext-worker-default:
image: frappe/erpnext-worker:${ERPNEXT_VERSION} image: graficheaquilane/erpnext-worker:${ERPNEXT_VERSION}
restart: on-failure restart: on-failure
command: worker command: worker
depends_on: depends_on:
@ -80,7 +80,7 @@ services:
- sites-vol:/home/frappe/frappe-bench/sites:rw - sites-vol:/home/frappe/frappe-bench/sites:rw
erpnext-worker-short: erpnext-worker-short:
image: frappe/erpnext-worker:${ERPNEXT_VERSION} image: graficheaquilane/erpnext-worker:${ERPNEXT_VERSION}
restart: on-failure restart: on-failure
command: worker command: worker
environment: environment:
@ -92,7 +92,7 @@ services:
- sites-vol:/home/frappe/frappe-bench/sites:rw - sites-vol:/home/frappe/frappe-bench/sites:rw
erpnext-worker-long: erpnext-worker-long:
image: frappe/erpnext-worker:${ERPNEXT_VERSION} image: graficheaquilane/erpnext-worker:${ERPNEXT_VERSION}
restart: on-failure restart: on-failure
command: worker command: worker
environment: environment:
@ -104,7 +104,7 @@ services:
- sites-vol:/home/frappe/frappe-bench/sites:rw - sites-vol:/home/frappe/frappe-bench/sites:rw
erpnext-schedule: erpnext-schedule:
image: frappe/erpnext-worker:${ERPNEXT_VERSION} image: graficheaquilane/erpnext-worker:${ERPNEXT_VERSION}
restart: on-failure restart: on-failure
command: schedule command: schedule
depends_on: depends_on:
@ -114,19 +114,19 @@ services:
- sites-vol:/home/frappe/frappe-bench/sites:rw - sites-vol:/home/frappe/frappe-bench/sites:rw
redis-cache: redis-cache:
image: redis:latest image: graficheaquilane/redis:latest
restart: on-failure restart: on-failure
volumes: volumes:
- redis-cache-vol:/data - redis-cache-vol:/data
redis-queue: redis-queue:
image: redis:latest image: graficheaquilane/redis:latest
restart: on-failure restart: on-failure
volumes: volumes:
- redis-queue-vol:/data - redis-queue-vol:/data
redis-socketio: redis-socketio:
image: redis:latest image: graficheaquilane/redis:latest
restart: on-failure restart: on-failure
volumes: volumes:
- redis-socketio-vol:/data - redis-socketio-vol:/data
@ -143,7 +143,7 @@ services:
- mariadb-vol:/var/lib/mysql - mariadb-vol:/var/lib/mysql
site-creator: site-creator:
image: frappe/erpnext-worker:${ERPNEXT_VERSION} image: graficheaquilane/erpnext-worker:${ERPNEXT_VERSION}
restart: "no" restart: "no"
command: new command: new
depends_on: depends_on:

View file

@ -3,4 +3,4 @@ FRAPPE_VERSION=edge
MARIADB_HOST=mariadb MARIADB_HOST=mariadb
MYSQL_ROOT_PASSWORD=admin MYSQL_ROOT_PASSWORD=admin
SITES=your.domain.com SITES=your.domain.com
LETSENCRYPT_EMAIL=your.email@your.domain.com LETSENCRYPT_EMAIL=ced@graficheaquilane.it

View file

@ -1,4 +1,4 @@
LETSENCRYPT_EMAIL=email@example.com LETSENCRYPT_EMAIL=ced@graficheaquilane.it
ERPNEXT_VERSION=edge ERPNEXT_VERSION=edge
FRAPPE_VERSION=edge FRAPPE_VERSION=edge
MARIADB_HOST=mariadb MARIADB_HOST=mariadb

View file

@ -1,10 +1,10 @@
LETSENCRYPT_EMAIL=email@example.com LETSENCRYPT_EMAIL=ced@graficheaquilane.it
ERPNEXT_VERSION=edge ERPNEXT_VERSION=edge
FRAPPE_VERSION=edge FRAPPE_VERSION=edge
MARIADB_HOST=mariadb MARIADB_HOST=mariadb
MYSQL_ROOT_PASSWORD=123 MYSQL_ROOT_PASSWORD=123
SITE_NAME=erp.example.com SITE_NAME=erp.graficheaquilane.it
SITES=`erp.example.com` SITES=`erp.graficheaquilane.it`
DB_ROOT_USER=root DB_ROOT_USER=root
ADMIN_PASSWORD=admin ADMIN_PASSWORD=admin
INSTALL_APPS=erpnext INSTALL_APPS=erpnext

View file

@ -9,9 +9,9 @@ IFS=$'\n\t'
__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" __dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
cd "$__dir" cd "$__dir"
env_url="https://raw.githubusercontent.com/frappe/frappe_docker/master/installation/env-example" env_url="https://raw.githubusercontent.com/GraficheAquilane2021/frappe_docker/master/installation/env-example"
docker_nginx_url="https://github.com/evertramos/docker-compose-letsencrypt-nginx-proxy-companion" docker_nginx_url="https://github.com/GraficheAquilane2021/docker-compose-letsencrypt-nginx-proxy-companion"
frappe_docker_url="https://github.com/frappe/frappe_docker" frappe_docker_url="https://github.com/GraficheAquilane2021/frappe_docker"
env_file="$__dir/.env" env_file="$__dir/.env"

View file

@ -25,7 +25,7 @@ def parse_args():
def git_version(service, version, branch): def git_version(service, version, branch):
print(f'Pulling {service} v{version}') print(f'Pulling {service} v{version}')
subprocess.run(f'git clone https://github.com/frappe/{service} --branch {branch}', shell=True) subprocess.run(f'git clone https://github.com/GraficheAquilane2021/{service} --branch {branch}', shell=True)
cd = os.getcwd() cd = os.getcwd()
os.chdir(os.getcwd() + f'/{service}') os.chdir(os.getcwd() + f'/{service}')
subprocess.run('git fetch --tags', shell=True) subprocess.run('git fetch --tags', shell=True)