mirror of
https://gitlab.com/flectra-hq/flectra.git
synced 2026-08-17 16:54:42 -05:00
[PATCH] upstream for base
This commit is contained in:
Vendored
+1
@@ -34,6 +34,7 @@ Depends:
|
||||
python3-libsass,
|
||||
python3-lxml,
|
||||
python3-mako,
|
||||
python3-num2words,
|
||||
python3-ofxparse,
|
||||
python3-passlib,
|
||||
python3-polib,
|
||||
|
||||
Vendored
+2
-2
@@ -12,6 +12,8 @@ case "${1}" in
|
||||
configure)
|
||||
if ! getent passwd | grep -q "^flectra:"; then
|
||||
adduser --system --home $FLECTRA_DATA_DIR --quiet --group $FLECTRA_USER
|
||||
# Data dir
|
||||
chown $FLECTRA_USER:$FLECTRA_GROUP $FLECTRA_DATA_DIR
|
||||
fi
|
||||
# Register "$FLECTRA_USER" as a postgres user with "Create DB" role attribute
|
||||
su - postgres -c "createuser -d -R -S $FLECTRA_USER" 2> /dev/null || true
|
||||
@@ -22,8 +24,6 @@ case "${1}" in
|
||||
mkdir -p $FLECTRA_LOG_DIR
|
||||
chown $FLECTRA_USER:$FLECTRA_GROUP $FLECTRA_LOG_DIR
|
||||
chmod 0750 $FLECTRA_LOG_DIR
|
||||
# Data dir
|
||||
chown $FLECTRA_USER:$FLECTRA_GROUP $FLECTRA_DATA_DIR
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
|
||||
+49
-52
@@ -1,60 +1,57 @@
|
||||
# Please note that this Dockerfile is used for testing nightly builds and should
|
||||
# not be used to deploy Odoo
|
||||
FROM fedora:30
|
||||
MAINTAINER FlectraHQ <info@flectrahq.com>
|
||||
FROM fedora:32
|
||||
MAINTAINER Odoo S.A. <info@odoo.com>
|
||||
|
||||
# Dependencies and postgres
|
||||
RUN dnf update -d 0 -e 0 -y && \
|
||||
dnf install -d 0 -e 0 \
|
||||
babel \
|
||||
createrepo \
|
||||
pychart \
|
||||
pyparsing \
|
||||
python3-babel \
|
||||
python3-decorator \
|
||||
python3-docutils \
|
||||
python3-feedparser \
|
||||
python3-gevent \
|
||||
python3-greenlet \
|
||||
python3-html2text \
|
||||
python3-jinja2 \
|
||||
python3-lxml \
|
||||
python3-mako \
|
||||
python3-markupsafe \
|
||||
python3-num2words \
|
||||
python3-ofxparse \
|
||||
python3-passlib \
|
||||
python3-pillow \
|
||||
python3-psutil \
|
||||
python3-pydot \
|
||||
python3-pyldap \
|
||||
python3-pyparsing \
|
||||
python3-PyPDF2 \
|
||||
python3-pyserial \
|
||||
python3-dateutil \
|
||||
python3-polib \
|
||||
python3-pytz \
|
||||
python3-pyusb \
|
||||
python3-qrcode \
|
||||
python3-reportlab \
|
||||
python3-requests \
|
||||
python3-six \
|
||||
python3-stdnum \
|
||||
python3-suds \
|
||||
python3-vobject \
|
||||
python3-werkzeug \
|
||||
python3-xlwt \
|
||||
python3-xlrd \
|
||||
python3-xlsxwriter \
|
||||
libsass \
|
||||
pytz \
|
||||
postgresql \
|
||||
postgresql-server \
|
||||
postgresql-libs \
|
||||
postgresql-contrib \
|
||||
postgresql-devel \
|
||||
rpmdevtools -y && \
|
||||
dnf clean all
|
||||
dnf install -d 0 -e 0 \
|
||||
createrepo \
|
||||
libsass \
|
||||
postgresql \
|
||||
postgresql-contrib \
|
||||
postgresql-devel \
|
||||
postgresql-libs \
|
||||
postgresql-server \
|
||||
python3-PyPDF2 \
|
||||
python3-babel \
|
||||
python3-dateutil \
|
||||
python3-decorator \
|
||||
python3-docutils \
|
||||
python3-freezegun \
|
||||
python3-gevent \
|
||||
python3-greenlet \
|
||||
python3-idna \
|
||||
python3-jinja2 \
|
||||
python3-lxml \
|
||||
python3-mako \
|
||||
python3-markupsafe \
|
||||
python3-mock \
|
||||
python3-num2words \
|
||||
python3-ofxparse \
|
||||
python3-passlib \
|
||||
python3-pillow \
|
||||
python3-polib \
|
||||
python3-psutil \
|
||||
python3-psycopg2 \
|
||||
python3-pydot \
|
||||
python3-pyldap \
|
||||
python3-pyserial \
|
||||
python3-pytz \
|
||||
python3-pyusb \
|
||||
python3-qrcode \
|
||||
python3-reportlab \
|
||||
python3-requests \
|
||||
python3-six \
|
||||
python3-stdnum \
|
||||
python3-vobject \
|
||||
python3-werkzeug \
|
||||
python3-xlrd \
|
||||
python3-xlsxwriter \
|
||||
python3-xlwt \
|
||||
python3-zeep \
|
||||
rpmdevtools -y && \
|
||||
dnf clean all
|
||||
|
||||
# Postgres configuration
|
||||
RUN mkdir -p /var/lib/postgres/data
|
||||
|
||||
@@ -9,6 +9,7 @@ FLECTRA_GROUP="flectra"
|
||||
FLECTRA_LOG_DIR=/var/log/flectra
|
||||
FLECTRA_LOG_FILE=$FLECTRA_LOG_DIR/flectra-server.log
|
||||
FLECTRA_USER="flectra"
|
||||
ABI=$(rpm -q --provides python3 | awk '/abi/ {print $NF}')
|
||||
|
||||
if ! getent passwd | grep -q "^flectra:"; then
|
||||
groupadd $FLECTRA_GROUP
|
||||
|
||||
@@ -13,7 +13,7 @@ trap cleanup EXIT
|
||||
wget -q http://get.enterprisedb.com/postgresql/postgresql-9.5.4-2-windows.exe
|
||||
|
||||
# wkhtmltopdf
|
||||
wget -q -P $TEMPDIR https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.1/wkhtmltox-0.12.1.2_msvc2013-win32.exe
|
||||
wget -q -P $TEMPDIR http://download.gna.org/wkhtmltopdf/0.12/0.12.1/wkhtmltox-0.12.1.2_msvc2013-win32.exe
|
||||
7z x -o$TEMPDIR $TEMPDIR/wkhtmltox-0.12.1.2_msvc2013-win32.exe
|
||||
cp $TEMPDIR/bin/wkhtmltopdf.exe ./wkhtmltopdf
|
||||
|
||||
|
||||
Reference in New Issue
Block a user