From bddecc8d1878ac9d860fe5cbee2c663a789e8f8a Mon Sep 17 00:00:00 2001 From: Felipe Paloschi Date: Tue, 23 Jan 2024 21:30:32 -0300 Subject: [PATCH 01/16] Fix Dockerfile for odoo17 --- .github/workflows/main.yml | 54 +++++++++---------- Dockerfile | 29 +++------- README.md | 2 - conf/apt-requirements | 108 +++++++++++++++++++++---------------- conf/brasil-requirements | 15 ------ conf/pip-requirements | 50 ----------------- conf/supervisord.conf | 2 +- 7 files changed, 99 insertions(+), 161 deletions(-) delete mode 100644 conf/brasil-requirements delete mode 100755 conf/pip-requirements diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index afc9c1b..034774a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,33 +1,33 @@ -name: Docker Image CI +# name: Docker Image CI -on: - schedule: - - cron: '30 5 10,20 * *' - push: - branches: [ 15.0 ] - workflow_dispatch: +# on: +# schedule: +# - cron: '30 5 10,20 * *' +# push: +# branches: [ 15.0 ] +# workflow_dispatch: -jobs: +# jobs: - build: +# build: - runs-on: ubuntu-latest +# runs-on: ubuntu-latest - steps: - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - push: true - tags: trustcode/docker-odoo-base:15.0 +# steps: +# - +# name: Set up Docker Buildx +# uses: docker/setup-buildx-action@v1 +# - +# name: Login to DockerHub +# uses: docker/login-action@v1 +# with: +# username: ${{ secrets.DOCKERHUB_USERNAME }} +# password: ${{ secrets.DOCKERHUB_TOKEN }} +# - +# name: Build and push +# id: docker_build +# uses: docker/build-push-action@v2 +# with: +# push: true +# tags: trustcode/docker-odoo-base:15.0 diff --git a/Dockerfile b/Dockerfile index 0980459..8b23f5d 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 ENV DEBIAN_FRONTEND noninteractive ENV TERM=xterm @@ -10,38 +10,30 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d RUN apt-get update ADD conf/apt-requirements /opt/sources/ -ADD conf/pip-requirements /opt/sources/ WORKDIR /opt/sources/ RUN apt-get install -y --no-install-recommends $(grep -v '^#' apt-requirements) -RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash - && \ - apt-get install -y nodejs && \ - curl -L https://www.npmjs.com/install.sh | sh && \ - npm install -g less && npm cache clean --force +RUN apt-get clean && apt-get update && apt-get install -y locales RUN locale-gen en_US en_US.UTF-8 pt_BR pt_BR.UTF-8 && \ dpkg-reconfigure locales ENV LC_ALL pt_BR.UTF-8 -ADD conf/brasil-requirements /opt/sources/ RUN pip3 install setuptools && pip3 install --no-cache-dir --upgrade pip -RUN pip3 install --no-cache-dir -r pip-requirements && \ - pip3 install --no-cache-dir -r brasil-requirements -ADD https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.bionic_amd64.deb /opt/sources/wkhtmltox.deb -RUN dpkg -i wkhtmltox.deb && rm wkhtmltox.deb +RUN wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb +RUN dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb -RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - -RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ bionic"-pgdg main | tee /etc/apt/sources.list.d/pgdg.list -RUN apt-get update && apt-get install -y postgresql-client-11 +ADD https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.bionic_amd64.deb /opt/sources/wkhtmltox.deb +RUN dpkg -i wkhtmltox.deb && rm wkhtmltox.deb RUN mkdir /opt/odoo/ WORKDIR /opt/odoo/ RUN mkdir private - ##### Configurações Odoo ##### +##### Configurações Odoo ##### ADD conf/supervisord.conf /etc/supervisor/supervisord.conf @@ -58,11 +50,6 @@ RUN mkdir /var/log/odoo && \ chown -R odoo:odoo /var/log/odoo && \ chown odoo:odoo /var/run/odoo.pid - ##### Limpeza da Instalação ##### - -RUN apt-get autoremove -y && \ - apt-get autoclean - - ##### Finalização do Container ##### +##### Finalização do Container ##### WORKDIR /opt/odoo diff --git a/README.md b/README.md index ce14568..0a9e95f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1 @@ # docker-odoo-base - -[![Docker Repository on Quay](https://quay.io/repository/danimaribeiro/docker-odoo-base/status "Docker Repository on Quay")](https://quay.io/repository/danimaribeiro/docker-odoo-base) diff --git a/conf/apt-requirements b/conf/apt-requirements index 6ed3621..d842f71 100755 --- a/conf/apt-requirements +++ b/conf/apt-requirements @@ -1,48 +1,66 @@ -##### Dependências Odoo ##### -libxml2-dev -libxslt1-dev -libevent-dev -libsasl2-dev -libldap2-dev -libpq-dev -libjpeg-dev -libtiff5-dev -libjpeg8-dev -libopenjp2-7-dev -zlib1g-dev -libfreetype6-dev -liblcms2-dev -libwebp-dev -libharfbuzz-dev -libfribidi-dev -libxcb1-dev - -# Ferramentas -gcc -g++ -python3-pip +adduser +fonts-dejavu-core +fonts-freefont-ttf +fonts-freefont-otf +fonts-noto-core +fonts-inconsolata +fonts-font-awesome +fonts-roboto-unhinted +gsfonts +libjs-underscore +lsb-base +postgresql-client python3-dev -locales -supervisor -curl -unzip -git +python3-babel +python3-chardet +python3-dateutil +python3-decorator +python3-docutils +python3-freezegun +python3-geoip2 +python3-pil +python3-jinja2 +python3-libsass +python3-lxml +python3-num2words +python3-ofxparse +python3-passlib +python3-polib +python3-psutil +python3-psycopg2 +python3-pydot +python3-openssl +python3-pypdf2 +python3-rjsmin +python3-qrcode +python3-renderpm +python3-reportlab +python3-requests +python3-stdnum +python3-tz +python3-vobject +python3-werkzeug +python3-xlsxwriter +python3-xlrd +python3-zeep +python3-pip +xfonts-75dpi +xfonts-base wget -gettext-base -openssh-client -postgresql-client - -##### Dependências da Localização Brasileira ##### -libssl-dev +gnupg2 +build-essential +libldap2-dev +libsasl2-dev +slapd +ldap-utils +tox +lcov +valgrind +zip +unzip +pkg-config +libxml2-dev libxmlsec1-dev -python-openssl -python-cffi - - -##### Dependências do WKHTMLTOX ##### -fontconfig -libx11-6 -libxext6 -libxrender1 -xfonts-base -xfonts-75dpi +libxmlsec1-openssl +gettext-base +supervisor \ No newline at end of file diff --git a/conf/brasil-requirements b/conf/brasil-requirements deleted file mode 100644 index d6751cc..0000000 --- a/conf/brasil-requirements +++ /dev/null @@ -1,15 +0,0 @@ -# odoo-brasil -suds-jurko-requests -xmlsec - -# trustcode-addons -urllib3==1.22 -pyopenssl==20.0.1 -iugu-trustcode - -# Atualizacao -click-odoo-contrib - -# Sentry -sentry-sdk -raven diff --git a/conf/pip-requirements b/conf/pip-requirements deleted file mode 100755 index f9c0877..0000000 --- a/conf/pip-requirements +++ /dev/null @@ -1,50 +0,0 @@ -Babel==2.9.1 # min version = 2.6.0 (Focal with security backports) -chardet==3.0.4 -cryptography==2.6.1 # incompatibility between pyopenssl 19.0.0 and cryptography>=37.0.0 -decorator==4.4.2 -docutils==0.16 -ebaysdk==2.1.5 -freezegun==0.3.11; python_version < '3.8' -freezegun==0.3.15; python_version >= '3.8' -gevent==1.5.0 ; python_version == '3.7' -gevent==20.9.0 ; python_version > '3.7' and python_version <= '3.9' -gevent==21.8.0 ; python_version > '3.9' # (Jammy) -greenlet==0.4.15 ; python_version == '3.7' -greenlet==0.4.17 ; python_version > '3.7' and python_version <= '3.9' -greenlet==1.1.2 ; python_version > '3.9' # (Jammy) -idna==2.8 -Jinja2==2.11.3 # min version = 2.10.1 (Focal - with security backports) -libsass==0.18.0 -lxml==4.6.5 # min version = 4.5.0 (Focal - with security backports) -MarkupSafe==1.1.0 -num2words==0.5.6 -ofxparse==0.19; python_version <= '3.9' -ofxparse==0.21; python_version > '3.9' # (Jammy) -passlib==1.7.3 # min version = 1.7.2 (Focal with security backports) -Pillow==9.0.1 # min version = 7.0.0 (Focal with security backports) -polib==1.1.0 -psutil==5.6.7 # min version = 5.5.1 (Focal with security backports) -psycopg2==2.7.7; sys_platform != 'win32' and python_version < '3.8' -psycopg2==2.8.6; sys_platform == 'win32' or python_version >= '3.8' -pydot==1.4.1 -pyopenssl==19.0.0 -PyPDF2==1.26.0 -pypiwin32 ; sys_platform == 'win32' -pyserial==3.4 -python-dateutil==2.7.3 -python-ldap==3.4.0 ; sys_platform != 'win32' # min version = 3.2.0 (Focal with security backports) -python-stdnum==1.13 -pytz==2019.3 -pyusb==1.0.2 -qrcode==6.1 -reportlab==3.5.59 # version < 3.5.54 are not compatible with Pillow 8.1.2 and 3.5.59 is bullseye -requests==2.25.1 # versions < 2.25 aren't compatible w/ urllib3 1.26. Bullseye = 2.25.1. min version = 2.22.0 (Focal) -urllib3==1.26.5 # indirect / min version = 1.25.8 (Focal with security backports) -vobject==0.9.6.1 -Werkzeug==0.16.1 ; python_version <= '3.9' -Werkzeug==2.0.2 ; python_version > '3.9' # (Jammy) -xlrd==1.1.0; python_version < '3.8' -xlrd==1.2.0; python_version >= '3.8' -XlsxWriter==1.1.2 -xlwt==1.3.* -zeep==3.4.0 \ No newline at end of file diff --git a/conf/supervisord.conf b/conf/supervisord.conf index 2777963..13c2cfc 100755 --- a/conf/supervisord.conf +++ b/conf/supervisord.conf @@ -6,7 +6,7 @@ loglevel=error ; info, debug, warn, trace file=/tmp/supervisor.sock ; (the path to the socket file) [program:odoo] -command=/usr/bin/odoo-server --config=/etc/odoo/odoo.conf --db_host=%(ENV_PG_HOST)s --db_port=%(ENV_PG_PORT)s --db_user=%(ENV_PG_USER)s --db_password=%(ENV_PG_PASSWORD)s --xmlrpc-port=%(ENV_PORT)s --longpolling-port=%(ENV_LONGPOLLING_PORT)s --workers=%(ENV_WORKERS)s +command=/usr/bin/odoo-server --config=/etc/odoo/odoo.conf --db_host=%(ENV_PG_HOST)s --db_port=%(ENV_PG_PORT)s --db_user=%(ENV_PG_USER)s --db_password=%(ENV_PG_PASSWORD)s --xmlrpc-port=%(ENV_PORT)s --longpolling-port=%(ENV_LONGPOLLING_PORT)s --workers=%(ENV_WORKERS)s %(ENV_EXTRA_ARGS)s stdout_logfile=/var/log/odoo/odoo.log user=odoo autorestart=true From 4ab673eca380de6bcdcd399c9992a75b727e321e Mon Sep 17 00:00:00 2001 From: Felipe Paloschi Date: Tue, 23 Jan 2024 21:37:53 -0300 Subject: [PATCH 02/16] Fix workflows --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 034774a..edf06f0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,4 +30,4 @@ # uses: docker/build-push-action@v2 # with: # push: true -# tags: trustcode/docker-odoo-base:15.0 +# tags: paloschisistemas/docker-odoo-base:17.0 From 33aea091e3bc28020075398d277963ccdf49cf6c Mon Sep 17 00:00:00 2001 From: Felipe Paloschi Date: Thu, 22 Feb 2024 15:21:35 -0300 Subject: [PATCH 03/16] Update requirements list --- conf/apt-requirements | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/conf/apt-requirements b/conf/apt-requirements index d842f71..9da3968 100755 --- a/conf/apt-requirements +++ b/conf/apt-requirements @@ -1,4 +1,6 @@ adduser +dh-python +packaging-dev fonts-dejavu-core fonts-freefont-ttf fonts-freefont-otf @@ -11,6 +13,10 @@ libjs-underscore lsb-base postgresql-client python3-dev +python3-gevent +python3-serial +python3-setuptools +python3-usb python3-babel python3-chardet python3-dateutil @@ -63,4 +69,5 @@ libxml2-dev libxmlsec1-dev libxmlsec1-openssl gettext-base -supervisor \ No newline at end of file +supervisor +rsync \ No newline at end of file From 7f622ae29bf0ee67da3c4460ce80cff9b8a03ddf Mon Sep 17 00:00:00 2001 From: Felipe Paloschi Date: Fri, 8 Mar 2024 13:45:59 -0300 Subject: [PATCH 04/16] Fix env variables on supervisord.conf --- conf/supervisord.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/supervisord.conf b/conf/supervisord.conf index 13c2cfc..292fedb 100755 --- a/conf/supervisord.conf +++ b/conf/supervisord.conf @@ -6,7 +6,7 @@ loglevel=error ; info, debug, warn, trace file=/tmp/supervisor.sock ; (the path to the socket file) [program:odoo] -command=/usr/bin/odoo-server --config=/etc/odoo/odoo.conf --db_host=%(ENV_PG_HOST)s --db_port=%(ENV_PG_PORT)s --db_user=%(ENV_PG_USER)s --db_password=%(ENV_PG_PASSWORD)s --xmlrpc-port=%(ENV_PORT)s --longpolling-port=%(ENV_LONGPOLLING_PORT)s --workers=%(ENV_WORKERS)s %(ENV_EXTRA_ARGS)s +command=/usr/bin/odoo-server --config=/etc/odoo/odoo.conf --db_host=%(ENV_PG_HOST)s --db_port=%(ENV_PG_PORT)s --db_user=%(ENV_PG_USER)s --db_password=%(ENV_PG_PASSWORD)s --xmlrpc-port=%(ENV_PORT)s --gevent-port=%(ENV_GEVENT_PORT)s --workers=%(ENV_WORKERS)s %(ENV_EXTRA_ARGS)s stdout_logfile=/var/log/odoo/odoo.log user=odoo autorestart=true From c4c3a974885097022012b06b67e72e974dc0c125 Mon Sep 17 00:00:00 2001 From: Felipe Paloschi Date: Thu, 14 Mar 2024 13:54:26 -0300 Subject: [PATCH 05/16] Add postgresql-client-16 to prevent errors with newer postgres versions --- Dockerfile | 6 +++++- conf/apt-requirements | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8b23f5d..7fb16a5 100755 --- a/Dockerfile +++ b/Dockerfile @@ -7,10 +7,14 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d ##### Dependências ##### -RUN apt-get update +RUN apt update && apt install gnupg2 wget curl -y ADD conf/apt-requirements /opt/sources/ +RUN echo "deb http://apt.postgresql.org/pub/repos/apt jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list +RUN curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/trusted.gpg.d/postgresql.gpg +RUN apt update && apt install postgresql-client-16 -y + WORKDIR /opt/sources/ RUN apt-get install -y --no-install-recommends $(grep -v '^#' apt-requirements) diff --git a/conf/apt-requirements b/conf/apt-requirements index 9da3968..35beca6 100755 --- a/conf/apt-requirements +++ b/conf/apt-requirements @@ -11,7 +11,6 @@ fonts-roboto-unhinted gsfonts libjs-underscore lsb-base -postgresql-client python3-dev python3-gevent python3-serial From 594e2440dc3eb5893a1befd1c2eeb04cc88163e0 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 13 Apr 2024 22:53:30 -0300 Subject: [PATCH 06/16] =?UTF-8?q?Altera=C3=A7=C3=B5es=20para=20a=20vers?= =?UTF-8?q?=C3=A3o=2016.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 37 ++++++-------- Dockerfile.v000 | 68 +++++++++++++++++++++++++ conf/apt-requirements | 114 +++++++++++++++++++++++++----------------- conf/pip-requirements | 50 ------------------ conf/supervisord.conf | 2 +- 5 files changed, 153 insertions(+), 118 deletions(-) create mode 100755 Dockerfile.v000 delete mode 100755 conf/pip-requirements diff --git a/Dockerfile b/Dockerfile index 0980459..4d01672 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 ENV DEBIAN_FRONTEND noninteractive ENV TERM=xterm @@ -7,41 +7,38 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d ##### Dependências ##### -RUN apt-get update +RUN apt update && apt install gnupg2 wget curl -y ADD conf/apt-requirements /opt/sources/ -ADD conf/pip-requirements /opt/sources/ + +RUN echo "deb http://apt.postgresql.org/pub/repos/apt jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list +RUN curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/trusted.gpg.d/postgresql.gpg +#RUN apt update && apt install postgresql-client-16 -y +RUN apt update && apt install postgresql-client-15 -y WORKDIR /opt/sources/ RUN apt-get install -y --no-install-recommends $(grep -v '^#' apt-requirements) -RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash - && \ - apt-get install -y nodejs && \ - curl -L https://www.npmjs.com/install.sh | sh && \ - npm install -g less && npm cache clean --force +RUN apt-get clean && apt-get update && apt-get install -y locales RUN locale-gen en_US en_US.UTF-8 pt_BR pt_BR.UTF-8 && \ dpkg-reconfigure locales ENV LC_ALL pt_BR.UTF-8 -ADD conf/brasil-requirements /opt/sources/ RUN pip3 install setuptools && pip3 install --no-cache-dir --upgrade pip -RUN pip3 install --no-cache-dir -r pip-requirements && \ - pip3 install --no-cache-dir -r brasil-requirements -ADD https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.bionic_amd64.deb /opt/sources/wkhtmltox.deb -RUN dpkg -i wkhtmltox.deb && rm wkhtmltox.deb +RUN wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb +RUN dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb -RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - -RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ bionic"-pgdg main | tee /etc/apt/sources.list.d/pgdg.list -RUN apt-get update && apt-get install -y postgresql-client-11 +ADD https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.bionic_amd64.deb /opt/sources/wkhtmltox.deb +RUN dpkg -i wkhtmltox.deb && rm wkhtmltox.deb RUN mkdir /opt/odoo/ WORKDIR /opt/odoo/ RUN mkdir private - ##### Configurações Odoo ##### +##### Configurações Odoo ##### ADD conf/supervisord.conf /etc/supervisor/supervisord.conf @@ -58,11 +55,7 @@ RUN mkdir /var/log/odoo && \ chown -R odoo:odoo /var/log/odoo && \ chown odoo:odoo /var/run/odoo.pid - ##### Limpeza da Instalação ##### - -RUN apt-get autoremove -y && \ - apt-get autoclean - - ##### Finalização do Container ##### +##### Finalização do Container ##### WORKDIR /opt/odoo + diff --git a/Dockerfile.v000 b/Dockerfile.v000 new file mode 100755 index 0000000..fa3e537 --- /dev/null +++ b/Dockerfile.v000 @@ -0,0 +1,68 @@ +FROM ubuntu:22.04 + +ENV DEBIAN_FRONTEND noninteractive +ENV TERM=xterm +# Avoid ERROR: invoke-rc.d: policy-rc.d denied execution of start. +RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d + + ##### Dependências ##### + +RUN apt-get update + +ADD conf/apt-requirements /opt/sources/ +ADD conf/pip-requirements /opt/sources/ + +WORKDIR /opt/sources/ +RUN apt-get install -y --no-install-recommends $(grep -v '^#' apt-requirements) + +RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash - && \ + apt-get install -y nodejs && \ + curl -L https://www.npmjs.com/install.sh | sh && \ + npm install -g less && npm cache clean --force + +RUN locale-gen en_US en_US.UTF-8 pt_BR pt_BR.UTF-8 && \ + dpkg-reconfigure locales + +ENV LC_ALL pt_BR.UTF-8 + +ADD conf/brasil-requirements /opt/sources/ +RUN pip3 install setuptools && pip3 install --no-cache-dir --upgrade pip +RUN pip3 install --no-cache-dir -r pip-requirements && \ + pip3 install --no-cache-dir -r brasil-requirements + +ADD https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.bionic_amd64.deb /opt/sources/wkhtmltox.deb +RUN dpkg -i wkhtmltox.deb && rm wkhtmltox.deb + +RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - +RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ bionic"-pgdg main | tee /etc/apt/sources.list.d/pgdg.list +RUN apt-get update && apt-get install -y postgresql-client-15 + +RUN mkdir /opt/odoo/ +WORKDIR /opt/odoo/ +RUN mkdir private + + ##### Configurações Odoo ##### + +ADD conf/supervisord.conf /etc/supervisor/supervisord.conf + +RUN mkdir /var/log/odoo && \ + mkdir /opt/dados && \ + mkdir /var/log/supervisord && \ + touch /var/log/odoo/odoo.log && \ + touch /var/run/odoo.pid && \ + ln -s /opt/odoo/odoo/odoo-bin /usr/bin/odoo-server && \ + ln -s /etc/odoo/odoo.conf && \ + ln -s /var/log/odoo/odoo.log && \ + useradd --system --home /opt --shell /bin/bash --uid 1040 odoo && \ + chown -R odoo:odoo /opt && \ + chown -R odoo:odoo /var/log/odoo && \ + chown odoo:odoo /var/run/odoo.pid + + ##### Limpeza da Instalação ##### + +RUN apt-get autoremove -y && \ + apt-get autoclean + + ##### Finalização do Container ##### + +WORKDIR /opt/odoo diff --git a/conf/apt-requirements b/conf/apt-requirements index 6ed3621..a5b6b41 100755 --- a/conf/apt-requirements +++ b/conf/apt-requirements @@ -1,48 +1,72 @@ -##### Dependências Odoo ##### -libxml2-dev -libxslt1-dev -libevent-dev -libsasl2-dev -libldap2-dev -libpq-dev -libjpeg-dev -libtiff5-dev -libjpeg8-dev -libopenjp2-7-dev -zlib1g-dev -libfreetype6-dev -liblcms2-dev -libwebp-dev -libharfbuzz-dev -libfribidi-dev -libxcb1-dev - -# Ferramentas -gcc -g++ -python3-pip +adduser +dh-python +packaging-dev +fonts-dejavu-core +fonts-freefont-ttf +fonts-freefont-otf +fonts-noto-core +fonts-inconsolata +fonts-font-awesome +fonts-roboto-unhinted +gsfonts +libjs-underscore +lsb-base python3-dev -locales -supervisor -curl -unzip -git +python3-gevent +python3-serial +python3-setuptools +python3-usb +python3-babel +python3-chardet +python3-dateutil +python3-decorator +python3-docutils +python3-freezegun +python3-geoip2 +python3-pil +python3-jinja2 +python3-libsass +python3-lxml +python3-num2words +python3-ofxparse +python3-passlib +python3-polib +python3-psutil +python3-psycopg2 +python3-pydot +python3-openssl +python3-pypdf2 +python3-rjsmin +python3-qrcode +python3-renderpm +python3-reportlab +python3-requests +python3-stdnum +python3-tz +python3-vobject +python3-werkzeug +python3-xlsxwriter +python3-xlrd +python3-zeep +python3-pip +xfonts-75dpi +xfonts-base wget -gettext-base -openssh-client -postgresql-client - -##### Dependências da Localização Brasileira ##### -libssl-dev +gnupg2 +build-essential +libldap2-dev +libsasl2-dev +slapd +ldap-utils +tox +lcov +valgrind +zip +unzip +pkg-config +libxml2-dev libxmlsec1-dev -python-openssl -python-cffi - - -##### Dependências do WKHTMLTOX ##### -fontconfig -libx11-6 -libxext6 -libxrender1 -xfonts-base -xfonts-75dpi +libxmlsec1-openssl +gettext-base +supervisor +rsync diff --git a/conf/pip-requirements b/conf/pip-requirements deleted file mode 100755 index f9c0877..0000000 --- a/conf/pip-requirements +++ /dev/null @@ -1,50 +0,0 @@ -Babel==2.9.1 # min version = 2.6.0 (Focal with security backports) -chardet==3.0.4 -cryptography==2.6.1 # incompatibility between pyopenssl 19.0.0 and cryptography>=37.0.0 -decorator==4.4.2 -docutils==0.16 -ebaysdk==2.1.5 -freezegun==0.3.11; python_version < '3.8' -freezegun==0.3.15; python_version >= '3.8' -gevent==1.5.0 ; python_version == '3.7' -gevent==20.9.0 ; python_version > '3.7' and python_version <= '3.9' -gevent==21.8.0 ; python_version > '3.9' # (Jammy) -greenlet==0.4.15 ; python_version == '3.7' -greenlet==0.4.17 ; python_version > '3.7' and python_version <= '3.9' -greenlet==1.1.2 ; python_version > '3.9' # (Jammy) -idna==2.8 -Jinja2==2.11.3 # min version = 2.10.1 (Focal - with security backports) -libsass==0.18.0 -lxml==4.6.5 # min version = 4.5.0 (Focal - with security backports) -MarkupSafe==1.1.0 -num2words==0.5.6 -ofxparse==0.19; python_version <= '3.9' -ofxparse==0.21; python_version > '3.9' # (Jammy) -passlib==1.7.3 # min version = 1.7.2 (Focal with security backports) -Pillow==9.0.1 # min version = 7.0.0 (Focal with security backports) -polib==1.1.0 -psutil==5.6.7 # min version = 5.5.1 (Focal with security backports) -psycopg2==2.7.7; sys_platform != 'win32' and python_version < '3.8' -psycopg2==2.8.6; sys_platform == 'win32' or python_version >= '3.8' -pydot==1.4.1 -pyopenssl==19.0.0 -PyPDF2==1.26.0 -pypiwin32 ; sys_platform == 'win32' -pyserial==3.4 -python-dateutil==2.7.3 -python-ldap==3.4.0 ; sys_platform != 'win32' # min version = 3.2.0 (Focal with security backports) -python-stdnum==1.13 -pytz==2019.3 -pyusb==1.0.2 -qrcode==6.1 -reportlab==3.5.59 # version < 3.5.54 are not compatible with Pillow 8.1.2 and 3.5.59 is bullseye -requests==2.25.1 # versions < 2.25 aren't compatible w/ urllib3 1.26. Bullseye = 2.25.1. min version = 2.22.0 (Focal) -urllib3==1.26.5 # indirect / min version = 1.25.8 (Focal with security backports) -vobject==0.9.6.1 -Werkzeug==0.16.1 ; python_version <= '3.9' -Werkzeug==2.0.2 ; python_version > '3.9' # (Jammy) -xlrd==1.1.0; python_version < '3.8' -xlrd==1.2.0; python_version >= '3.8' -XlsxWriter==1.1.2 -xlwt==1.3.* -zeep==3.4.0 \ No newline at end of file diff --git a/conf/supervisord.conf b/conf/supervisord.conf index 2777963..292fedb 100755 --- a/conf/supervisord.conf +++ b/conf/supervisord.conf @@ -6,7 +6,7 @@ loglevel=error ; info, debug, warn, trace file=/tmp/supervisor.sock ; (the path to the socket file) [program:odoo] -command=/usr/bin/odoo-server --config=/etc/odoo/odoo.conf --db_host=%(ENV_PG_HOST)s --db_port=%(ENV_PG_PORT)s --db_user=%(ENV_PG_USER)s --db_password=%(ENV_PG_PASSWORD)s --xmlrpc-port=%(ENV_PORT)s --longpolling-port=%(ENV_LONGPOLLING_PORT)s --workers=%(ENV_WORKERS)s +command=/usr/bin/odoo-server --config=/etc/odoo/odoo.conf --db_host=%(ENV_PG_HOST)s --db_port=%(ENV_PG_PORT)s --db_user=%(ENV_PG_USER)s --db_password=%(ENV_PG_PASSWORD)s --xmlrpc-port=%(ENV_PORT)s --gevent-port=%(ENV_GEVENT_PORT)s --workers=%(ENV_WORKERS)s %(ENV_EXTRA_ARGS)s stdout_logfile=/var/log/odoo/odoo.log user=odoo autorestart=true From c6a9f345abb2e15858b6134634be74a2881c164d Mon Sep 17 00:00:00 2001 From: root Date: Sat, 13 Apr 2024 22:54:58 -0300 Subject: [PATCH 07/16] =?UTF-8?q?Altera=C3=A7=C3=B5es=20para=20a=20vers?= =?UTF-8?q?=C3=A3o=2016.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile.v000 | 68 ------------------------------------------------- 1 file changed, 68 deletions(-) delete mode 100755 Dockerfile.v000 diff --git a/Dockerfile.v000 b/Dockerfile.v000 deleted file mode 100755 index fa3e537..0000000 --- a/Dockerfile.v000 +++ /dev/null @@ -1,68 +0,0 @@ -FROM ubuntu:22.04 - -ENV DEBIAN_FRONTEND noninteractive -ENV TERM=xterm -# Avoid ERROR: invoke-rc.d: policy-rc.d denied execution of start. -RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d - - ##### Dependências ##### - -RUN apt-get update - -ADD conf/apt-requirements /opt/sources/ -ADD conf/pip-requirements /opt/sources/ - -WORKDIR /opt/sources/ -RUN apt-get install -y --no-install-recommends $(grep -v '^#' apt-requirements) - -RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash - && \ - apt-get install -y nodejs && \ - curl -L https://www.npmjs.com/install.sh | sh && \ - npm install -g less && npm cache clean --force - -RUN locale-gen en_US en_US.UTF-8 pt_BR pt_BR.UTF-8 && \ - dpkg-reconfigure locales - -ENV LC_ALL pt_BR.UTF-8 - -ADD conf/brasil-requirements /opt/sources/ -RUN pip3 install setuptools && pip3 install --no-cache-dir --upgrade pip -RUN pip3 install --no-cache-dir -r pip-requirements && \ - pip3 install --no-cache-dir -r brasil-requirements - -ADD https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.bionic_amd64.deb /opt/sources/wkhtmltox.deb -RUN dpkg -i wkhtmltox.deb && rm wkhtmltox.deb - -RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - -RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ bionic"-pgdg main | tee /etc/apt/sources.list.d/pgdg.list -RUN apt-get update && apt-get install -y postgresql-client-15 - -RUN mkdir /opt/odoo/ -WORKDIR /opt/odoo/ -RUN mkdir private - - ##### Configurações Odoo ##### - -ADD conf/supervisord.conf /etc/supervisor/supervisord.conf - -RUN mkdir /var/log/odoo && \ - mkdir /opt/dados && \ - mkdir /var/log/supervisord && \ - touch /var/log/odoo/odoo.log && \ - touch /var/run/odoo.pid && \ - ln -s /opt/odoo/odoo/odoo-bin /usr/bin/odoo-server && \ - ln -s /etc/odoo/odoo.conf && \ - ln -s /var/log/odoo/odoo.log && \ - useradd --system --home /opt --shell /bin/bash --uid 1040 odoo && \ - chown -R odoo:odoo /opt && \ - chown -R odoo:odoo /var/log/odoo && \ - chown odoo:odoo /var/run/odoo.pid - - ##### Limpeza da Instalação ##### - -RUN apt-get autoremove -y && \ - apt-get autoclean - - ##### Finalização do Container ##### - -WORKDIR /opt/odoo From a9233dee97d7669a0a140800d6960d58a46b91b5 Mon Sep 17 00:00:00 2001 From: Luciano Vicentini Date: Tue, 16 Apr 2024 20:01:42 +0000 Subject: [PATCH 08/16] =?UTF-8?q?Altera=C3=A7=C3=B5es=20para=20a=20vers?= =?UTF-8?q?=C3=A3o=2017.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index edf06f0..0cd1b6e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,4 +30,4 @@ # uses: docker/build-push-action@v2 # with: # push: true -# tags: paloschisistemas/docker-odoo-base:17.0 +# tags: evopsbr/docker-odoo-base:17.0 From 1847f03fa30b9ac43d7e789ac050017bd1e5b738 Mon Sep 17 00:00:00 2001 From: Evolution Professional Services Brasil <166778262+evopsbr@users.noreply.github.com> Date: Tue, 16 Apr 2024 17:25:02 -0300 Subject: [PATCH 09/16] Create docker-image.yml --- .github/workflows/docker-image.yml | 59 ++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..19c67cd --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,59 @@ +name: Build and Push Docker Image to Docker Hub + +on: + push: + branches: [ "dev", "main" ] + pull_request: + branches: [ "dev", "main" ] + +env: + # Use docker.io for Docker Hub if empty + REGISTRY: docker.io + # github.repository as / + IMAGE_NAME: ${{ github.repository }} + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Build the Docker image + run: docker-compose build --no-cache --force-rm + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Test the Docker image + run: docker-compose up -d + push_to_registry: + name: Push Docker image to Docker Hub + runs-on: ubuntu-latest + steps: + - name: Check out the repo + uses: actions/checkout@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Log in to Docker Hub + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + + - name: Build and push Docker image + uses: docker/build-push-action@v2 + with: + context: "{{defaultContext}}" + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} From 642b5d4bbd84456728c2a272594cee45b1398587 Mon Sep 17 00:00:00 2001 From: Evolution Professional Services Brasil <166778262+evopsbr@users.noreply.github.com> Date: Tue, 16 Apr 2024 17:28:03 -0300 Subject: [PATCH 10/16] Delete .github/workflows directory --- .github/workflows/docker-image.yml | 59 ------------------------------ .github/workflows/main.yml | 33 ----------------- 2 files changed, 92 deletions(-) delete mode 100644 .github/workflows/docker-image.yml delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml deleted file mode 100644 index 19c67cd..0000000 --- a/.github/workflows/docker-image.yml +++ /dev/null @@ -1,59 +0,0 @@ -name: Build and Push Docker Image to Docker Hub - -on: - push: - branches: [ "dev", "main" ] - pull_request: - branches: [ "dev", "main" ] - -env: - # Use docker.io for Docker Hub if empty - REGISTRY: docker.io - # github.repository as / - IMAGE_NAME: ${{ github.repository }} - -jobs: - - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Build the Docker image - run: docker-compose build --no-cache --force-rm - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Test the Docker image - run: docker-compose up -d - push_to_registry: - name: Push Docker image to Docker Hub - runs-on: ubuntu-latest - steps: - - name: Check out the repo - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to Docker Hub - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - - name: Build and push Docker image - uses: docker/build-push-action@v2 - with: - context: "{{defaultContext}}" - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 0cd1b6e..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,33 +0,0 @@ - -# name: Docker Image CI - -# on: -# schedule: -# - cron: '30 5 10,20 * *' -# push: -# branches: [ 15.0 ] -# workflow_dispatch: - -# jobs: - -# build: - -# runs-on: ubuntu-latest - -# steps: -# - -# name: Set up Docker Buildx -# uses: docker/setup-buildx-action@v1 -# - -# name: Login to DockerHub -# uses: docker/login-action@v1 -# with: -# username: ${{ secrets.DOCKERHUB_USERNAME }} -# password: ${{ secrets.DOCKERHUB_TOKEN }} -# - -# name: Build and push -# id: docker_build -# uses: docker/build-push-action@v2 -# with: -# push: true -# tags: evopsbr/docker-odoo-base:17.0 From 7479611f0d9373ac0edfee88d7ef1688ea04aaff Mon Sep 17 00:00:00 2001 From: Evolution Professional Services Brasil <166778262+evopsbr@users.noreply.github.com> Date: Tue, 16 Apr 2024 17:28:23 -0300 Subject: [PATCH 11/16] Create main.yml --- .github/workflows/main.yml | 59 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..19c67cd --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,59 @@ +name: Build and Push Docker Image to Docker Hub + +on: + push: + branches: [ "dev", "main" ] + pull_request: + branches: [ "dev", "main" ] + +env: + # Use docker.io for Docker Hub if empty + REGISTRY: docker.io + # github.repository as / + IMAGE_NAME: ${{ github.repository }} + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Build the Docker image + run: docker-compose build --no-cache --force-rm + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Test the Docker image + run: docker-compose up -d + push_to_registry: + name: Push Docker image to Docker Hub + runs-on: ubuntu-latest + steps: + - name: Check out the repo + uses: actions/checkout@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Log in to Docker Hub + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + + - name: Build and push Docker image + uses: docker/build-push-action@v2 + with: + context: "{{defaultContext}}" + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} From 2f9ee8ca9cd1197f18adbf7f8b860f9ce9f31d0b Mon Sep 17 00:00:00 2001 From: Evolution Professional Services Brasil <166778262+evopsbr@users.noreply.github.com> Date: Tue, 16 Apr 2024 17:39:44 -0300 Subject: [PATCH 12/16] Delete .github/workflows directory --- .github/workflows/main.yml | 59 -------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 19c67cd..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,59 +0,0 @@ -name: Build and Push Docker Image to Docker Hub - -on: - push: - branches: [ "dev", "main" ] - pull_request: - branches: [ "dev", "main" ] - -env: - # Use docker.io for Docker Hub if empty - REGISTRY: docker.io - # github.repository as / - IMAGE_NAME: ${{ github.repository }} - -jobs: - - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Build the Docker image - run: docker-compose build --no-cache --force-rm - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Test the Docker image - run: docker-compose up -d - push_to_registry: - name: Push Docker image to Docker Hub - runs-on: ubuntu-latest - steps: - - name: Check out the repo - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to Docker Hub - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - - name: Build and push Docker image - uses: docker/build-push-action@v2 - with: - context: "{{defaultContext}}" - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} From faf1582c138ed6f32ea015e532d29a906fed3dcc Mon Sep 17 00:00:00 2001 From: Evolution Professional Services Brasil <166778262+evopsbr@users.noreply.github.com> Date: Tue, 16 Apr 2024 17:40:01 -0300 Subject: [PATCH 13/16] Create main.yml --- .github/workflows/main.yml | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..eb6ff5c --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,45 @@ +name: Build and Push Docker Image to Docker Hub + +on: + push: + branches: [ "17.0" ] + pull_request: + branches: [ "17.0" ] + +env: + # Use docker.io for Docker Hub if empty + REGISTRY: docker.io + # github.repository as / + IMAGE_NAME: ${{ github.repository }} + +jobs: + + push_to_registry: + name: Push Docker image to Docker Hub + runs-on: ubuntu-latest + steps: + - name: Check out the repo + uses: actions/checkout@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Log in to Docker Hub + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + + - name: Build and push Docker image + uses: docker/build-push-action@v2 + with: + context: "{{defaultContext}}" + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} From a9cda7bf5021dcc4811b4a70b9cd8c10e25d9a39 Mon Sep 17 00:00:00 2001 From: Evolution Professional Services Brasil <166778262+evopsbr@users.noreply.github.com> Date: Thu, 18 Apr 2024 22:09:05 -0300 Subject: [PATCH 14/16] Create main 14.0.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eb6ff5c..1e7d6dc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,9 +2,9 @@ name: Build and Push Docker Image to Docker Hub on: push: - branches: [ "17.0" ] + branches: [ "14.0" ] pull_request: - branches: [ "17.0" ] + branches: [ "14.0" ] env: # Use docker.io for Docker Hub if empty From 92ec5318e0736114e5344fc92071767fa2c205d6 Mon Sep 17 00:00:00 2001 From: Evolution Professional Services Brasil <166778262+evopsbr@users.noreply.github.com> Date: Thu, 18 Apr 2024 22:10:12 -0300 Subject: [PATCH 15/16] Create main 14.0.yml From 24d79a54760377368009354308f86f28bb81d5fd Mon Sep 17 00:00:00 2001 From: Evolution Professional Services Brasil <166778262+evopsbr@users.noreply.github.com> Date: Thu, 18 Apr 2024 22:11:07 -0300 Subject: [PATCH 16/16] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1e7d6dc..eb6ff5c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,9 +2,9 @@ name: Build and Push Docker Image to Docker Hub on: push: - branches: [ "14.0" ] + branches: [ "17.0" ] pull_request: - branches: [ "14.0" ] + branches: [ "17.0" ] env: # Use docker.io for Docker Hub if empty