Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
odoo_docker
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Container Registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Le Filament
odoo_docker
Commits
6244e96a
Commit
6244e96a
authored
3 years ago
by
Rémi - Le Filament
Browse files
Options
Downloads
Patches
Plain Diff
[IMP] Update labels
parent
63fd1761
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Pipelines
59
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
12.0.Dockerfile
+3
-8
3 additions, 8 deletions
12.0.Dockerfile
12.0.Dockerfile.arm
+17
-22
17 additions, 22 deletions
12.0.Dockerfile.arm
12.0_ml.Dockerfile
+3
-8
3 additions, 8 deletions
12.0_ml.Dockerfile
12.0_py3.6.Dockerfile
+3
-8
3 additions, 8 deletions
12.0_py3.6.Dockerfile
with
26 additions
and
46 deletions
12.0.Dockerfile
+
3
−
8
View file @
6244e96a
...
@@ -118,7 +118,7 @@ RUN set -x; \
...
@@ -118,7 +118,7 @@ RUN set -x; \
/opt/odoo/additional_addons/
&&
\
/opt/odoo/additional_addons/
&&
\
rm
-rf
/tmp/oca-repos/
&&
\
rm
-rf
/tmp/oca-repos/
&&
\
find /opt/odoo/additional_addons/
*
/i18n/
-type
f
-not
-name
'fr.po'
-delete
&&
\
find /opt/odoo/additional_addons/
*
/i18n/
-type
f
-not
-name
'fr.po'
-delete
&&
\
chown
-R
odoo:odoo /opt/odoo
chown
-R
odoo:odoo /opt/odoo
# Copy entrypoint script and Odoo configuration file
# Copy entrypoint script and Odoo configuration file
COPY
./entrypoint.sh /
COPY
./entrypoint.sh /
...
@@ -139,12 +139,7 @@ ENTRYPOINT ["/entrypoint.sh"]
...
@@ -139,12 +139,7 @@ ENTRYPOINT ["/entrypoint.sh"]
CMD
["odoo"]
CMD
["odoo"]
# Metadata
# Metadata
ARG
VCS_REF
LABEL
org.label-schema.schema-version="12.0" \
ARG
BUILD_DATE
ARG
VERSION
LABEL
org.label-schema.schema-version="$VERSION" \
org.label-schema.vendor=LeFilament \
org.label-schema.vendor=LeFilament \
org.label-schema.license=Apache-2.0 \
org.label-schema.license=Apache-2.0 \
org.label-schema.build-date="$BUILD_DATE" \
org.label-schema.vcs-url="https://sources.le-filament.com/lefilament/odoo_docker"
org.label-schema.vcs-ref="$VCS_REF" \
org.label-schema.vcs-url="https://github.com/lefilament/docker-odoo"
This diff is collapsed.
Click to expand it.
12.0.Dockerfile.arm
+
17
−
22
View file @
6244e96a
...
@@ -6,8 +6,8 @@ ENV APT_DEPS='build-essential libldap2-dev libpq-dev libxml2-dev zlib1g-dev libx
...
@@ -6,8 +6,8 @@ ENV APT_DEPS='build-essential libldap2-dev libpq-dev libxml2-dev zlib1g-dev libx
LC_ALL=C.UTF-8 \
LC_ALL=C.UTF-8 \
PGDATABASE=odoo
PGDATABASE=odoo
RUN set -x; \
RUN set -x; \
apt-get update &&\
apt-get update &&\
apt-get install -y --no-install-recommends \
apt-get install -y --no-install-recommends \
ca-certificates \
ca-certificates \
curl \
curl \
...
@@ -34,20 +34,20 @@ RUN set -x; \
...
@@ -34,20 +34,20 @@ RUN set -x; \
xfonts-75dpi \
xfonts-75dpi \
xfonts-base \
xfonts-base \
xz-utils \
xz-utils \
&& \
&& \
echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' >> /etc/apt/sources.list.d/postgresql.list && \
echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' >> /etc/apt/sources.list.d/postgresql.list && \
curl -SL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
curl -SL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.raspbian.stretch_armhf.deb && \
curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.raspbian.stretch_armhf.deb && \
seq 1 8 | xargs -I{} mkdir -p /usr/share/man/man{} && \
seq 1 8 | xargs -I{} mkdir -p /usr/share/man/man{} && \
apt-get update && \
apt-get update && \
apt-get install -y --no-install-recommends ./wkhtmltox.deb && \
apt-get install -y --no-install-recommends ./wkhtmltox.deb && \
apt-get install -y --no-install-recommends postgresql-client && \
apt-get install -y --no-install-recommends postgresql-client && \
apt-get install -y --no-install-recommends ${APT_DEPS} && \
apt-get install -y --no-install-recommends ${APT_DEPS} && \
curl https://bootstrap.pypa.io/pip/3.5/get-pip.py | python3 /dev/stdin &&\
curl https://bootstrap.pypa.io/pip/3.5/get-pip.py | python3 /dev/stdin &&\
pip install -I -r https://raw.githubusercontent.com/OCA/OCB/12.0/requirements.txt && \
pip install -I -r https://raw.githubusercontent.com/OCA/OCB/12.0/requirements.txt && \
pip install simplejson WTForms zxcvbn phonenumbers Werkzeug==0.14.1 python3-openid netbluemind && \
pip install simplejson WTForms zxcvbn phonenumbers Werkzeug==0.14.1 python3-openid netbluemind && \
apt-get -y purge ${APT_DEPS} && \
apt-get -y purge ${APT_DEPS} && \
apt-get -y autoremove && \
apt-get -y autoremove && \
rm -rf /var/lib/apt/lists/* wkhtmltox.deb
rm -rf /var/lib/apt/lists/* wkhtmltox.deb
# Add Git Known Hosts
# Add Git Known Hosts
...
@@ -142,12 +142,7 @@ ENTRYPOINT ["/entrypoint.sh"]
...
@@ -142,12 +142,7 @@ ENTRYPOINT ["/entrypoint.sh"]
CMD ["odoo"]
CMD ["odoo"]
# Metadata
# Metadata
ARG VCS_REF
LABEL org.label-schema.schema-version="12.0" \
ARG BUILD_DATE
ARG VERSION
LABEL org.label-schema.schema-version="$VERSION" \
org.label-schema.vendor=LeFilament \
org.label-schema.vendor=LeFilament \
org.label-schema.license=Apache-2.0 \
org.label-schema.license=Apache-2.0 \
org.label-schema.build-date="$BUILD_DATE" \
org.label-schema.vcs-url="https://sources.le-filament.com/lefilament/odoo_docker"
org.label-schema.vcs-ref="$VCS_REF" \
org.label-schema.vcs-url="https://github.com/lefilament/docker-odoo"
This diff is collapsed.
Click to expand it.
12.0_ml.Dockerfile
+
3
−
8
View file @
6244e96a
...
@@ -116,7 +116,7 @@ RUN set -x; \
...
@@ -116,7 +116,7 @@ RUN set -x; \
/tmp/oca-repos/web/web_timeline
\
/tmp/oca-repos/web/web_timeline
\
/opt/odoo/additional_addons/
&&
\
/opt/odoo/additional_addons/
&&
\
rm
-rf
/tmp/oca-repos/
&&
\
rm
-rf
/tmp/oca-repos/
&&
\
chown
-R
odoo:odoo /opt/odoo
chown
-R
odoo:odoo /opt/odoo
# Copy entrypoint script and Odoo configuration file
# Copy entrypoint script and Odoo configuration file
COPY
./entrypoint.sh /
COPY
./entrypoint.sh /
...
@@ -137,12 +137,7 @@ ENTRYPOINT ["/entrypoint.sh"]
...
@@ -137,12 +137,7 @@ ENTRYPOINT ["/entrypoint.sh"]
CMD
["odoo"]
CMD
["odoo"]
# Metadata
# Metadata
ARG
VCS_REF
LABEL
org.label-schema.schema-version="12.0_ml" \
ARG
BUILD_DATE
ARG
VERSION
LABEL
org.label-schema.schema-version="$VERSION" \
org.label-schema.vendor=LeFilament \
org.label-schema.vendor=LeFilament \
org.label-schema.license=Apache-2.0 \
org.label-schema.license=Apache-2.0 \
org.label-schema.build-date="$BUILD_DATE" \
org.label-schema.vcs-url="https://sources.le-filament.com/lefilament/odoo_docker"
org.label-schema.vcs-ref="$VCS_REF" \
org.label-schema.vcs-url="https://github.com/lefilament/docker-odoo"
This diff is collapsed.
Click to expand it.
12.0_py3.6.Dockerfile
+
3
−
8
View file @
6244e96a
...
@@ -101,7 +101,7 @@ RUN set -x; \
...
@@ -101,7 +101,7 @@ RUN set -x; \
/opt/odoo/additional_addons/
&&
\
/opt/odoo/additional_addons/
&&
\
rm
-rf
/tmp/oca-repos/
&&
\
rm
-rf
/tmp/oca-repos/
&&
\
find /opt/odoo/additional_addons/
*
/i18n/
-type
f
-not
-name
'fr.po'
-delete
&&
\
find /opt/odoo/additional_addons/
*
/i18n/
-type
f
-not
-name
'fr.po'
-delete
&&
\
chown
-R
odoo:odoo /opt/odoo
chown
-R
odoo:odoo /opt/odoo
# Copy entrypoint script and Odoo configuration file
# Copy entrypoint script and Odoo configuration file
COPY
./entrypoint.sh /
COPY
./entrypoint.sh /
...
@@ -122,12 +122,7 @@ ENTRYPOINT ["/entrypoint.sh"]
...
@@ -122,12 +122,7 @@ ENTRYPOINT ["/entrypoint.sh"]
CMD
["odoo"]
CMD
["odoo"]
# Metadata
# Metadata
ARG
VCS_REF
LABEL
org.label-schema.schema-version="12.0_py3.6" \
ARG
BUILD_DATE
ARG
VERSION
LABEL
org.label-schema.schema-version="$VERSION" \
org.label-schema.vendor=LeFilament \
org.label-schema.vendor=LeFilament \
org.label-schema.license=Apache-2.0 \
org.label-schema.license=Apache-2.0 \
org.label-schema.build-date="$BUILD_DATE" \
org.label-schema.vcs-url="https://sources.le-filament.com/lefilament/odoo_docker"
org.label-schema.vcs-ref="$VCS_REF" \
org.label-schema.vcs-url="https://github.com/lefilament/docker-odoo"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment