Open-Harbor/docker-odoo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

[FIX] Odoo 10.0-12.0: use long ID's for gpg keys

Browse Source 
Use long gpg ID's to avoid collisions.
This commit is contained in:
Christophe Monniez 2019-01-31 17:18:17 +01:00
parent 87f0174dca
commit d3e44ad1f3
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
10.0/Dockerfile
View File

@ -29,11 +29,13 @@ RUN set -x; \
RUN set -x; \ RUN set -x; \
echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' > etc/apt/sources.list.d/pgdg.list \ echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' > etc/apt/sources.list.d/pgdg.list \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ACCC4CF8 \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
&& gpg --armor --export ACCC4CF8 | apt-key add - \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
&& gpg --armor --export "${repokey}" | apt-key add - \
&& rm -rf "$GNUPGHOME" \ && rm -rf "$GNUPGHOME" \
&& apt-get update \ && apt-get update \
&& apt-get install -y postgresql-client && apt-get install -y postgresql-client \
&& rm -rf /var/lib/apt/lists/*
# Install Odoo # Install Odoo
ENV ODOO_VERSION 10.0 ENV ODOO_VERSION 10.0

8
11.0/Dockerfile
View File

@ -33,12 +33,14 @@ RUN set -x; \
RUN set -x; \ RUN set -x; \
echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > etc/apt/sources.list.d/pgdg.list \ echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > etc/apt/sources.list.d/pgdg.list \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ACCC4CF8 \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
&& gpg --armor --export ACCC4CF8 | apt-key add - \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
&& gpg --armor --export "${repokey}" | apt-key add - \
&& gpgconf --kill all \ && gpgconf --kill all \
&& rm -rf "$GNUPGHOME" \ && rm -rf "$GNUPGHOME" \
&& apt-get update \ && apt-get update \
&& apt-get install -y postgresql-client && apt-get install -y postgresql-client \
&& rm -rf /var/lib/apt/lists/*
# Install Odoo # Install Odoo
ENV ODOO_VERSION 11.0 ENV ODOO_VERSION 11.0

16
12.0/Dockerfile
View File

@ -33,24 +33,28 @@ RUN set -x; \
RUN set -x; \ RUN set -x; \
echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > etc/apt/sources.list.d/pgdg.list \ echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > etc/apt/sources.list.d/pgdg.list \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ACCC4CF8 \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
&& gpg --armor --export ACCC4CF8 | apt-key add - \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
&& gpg --armor --export "${repokey}" | apt-key add - \
&& gpgconf --kill all \ && gpgconf --kill all \
&& rm -rf "$GNUPGHOME" \ && rm -rf "$GNUPGHOME" \
&& apt-get update \ && apt-get update \
&& apt-get install -y postgresql-client && apt-get install -y postgresql-client \
&& rm -rf /var/lib/apt/lists/*
# Install rtlcss (on Debian stretch) # Install rtlcss (on Debian stretch)
RUN set -x;\ RUN set -x;\
echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \ echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 68576280 \ && repokey='9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280' \
&& gpg --armor --export 68576280 | apt-key add - \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
&& gpg --armor --export "${repokey}" | apt-key add - \
&& gpgconf --kill all \ && gpgconf --kill all \
&& rm -rf "$GNUPGHOME" \ && rm -rf "$GNUPGHOME" \
&& apt-get update \ && apt-get update \
&& apt-get install -y nodejs \ && apt-get install -y nodejs \
&& npm install -g rtlcss && npm install -g rtlcss \
&& rm -rf /var/lib/apt/lists/*
# Install Odoo # Install Odoo
ENV ODOO_VERSION 12.0 ENV ODOO_VERSION 12.0