Skip to content

Commit d469268

Browse files
TardoTardo
committed
imp: support podman
1 parent 4151f11 commit d469268

19 files changed

+239
-101
lines changed

‎10.0.Dockerfile‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ WORKDIR /home/odoo
8585

8686
# Install NodeJS & Depedencies
8787
ARG NVM_VERSION="v0.40.3" \
88+
NVM_DIR=/home/odoo/.nvm \
8889
NVM_INSTALL_SHA256="2d8359a64a3cb07c02389ad88ceecd43f2fa469c06104f92f98df5b6f315275f" \
8990
NODE_VERSION="4.9.1" \
9091
ODOO_NPM_PKGS="rtlcss less@2.5.3 less-plugin-clean-css"
@@ -95,7 +96,7 @@ RUN set -ex; \
9596
echo "${NVM_INSTALL_SHA256} install-nvm.sh" | sha256sum -c -; \
9697
bash install-nvm.sh; \
9798
rm install-nvm.sh; \
98-
. /home/odoo/.nvm/nvm.sh; \
99+
. "${NVM_DIR}/nvm.sh"; \
99100
nvm install "${NODE_VERSION}"; \
100101
nvm use "${NODE_VERSION}"; \
101102
npm install -g ${ODOO_NPM_PKGS}; \
@@ -123,7 +124,7 @@ RUN set -eux; \
123124

124125
# Install System PIP & Extra dependencies
125126
RUN set -eux; \
126-
"$PYTHON_SYSTEM_BIN_NAME" -m venv ~/.venv; \
127+
"$PYTHON_SYSTEM_BIN_NAME" -m venv /home/odoo/.venv; \
127128
. .venv/bin/activate; \
128129
pip install --no-cache-dir --upgrade pip; \
129130
pip install --no-cache-dir click-odoo-contrib git-aggregator pyyaml psycopg2; \
@@ -174,7 +175,7 @@ USER odoo
174175

175176
# Verifications
176177
RUN set -ex; \
177-
. ~/.nvm/nvm.sh; \
178+
. "${NVM_DIR}/nvm.sh"; \
178179
wkhtmltopdf --version; \
179180
node --version; \
180181
/home/odoo/.venv/bin/python --version; \
@@ -187,6 +188,7 @@ ONBUILD ARG EXT_DEPS_OVERRIDES='' \
187188
AUTO_DOWNLOAD_DEPENDENCIES=true
188189
ONBUILD ENV LC_ALL="C.UTF-8" \
189190
LANG="C.UTF-8" \
191+
NVM_DIR=/home/odoo/.nvm \
190192
GIT_DEPTH_NORMAL=1 \
191193
GIT_DEPTH_MERGE=500 \
192194
EXT_DEPS_OVERRIDES="openid:python-openid,ldap:python-ldap,evdev:evdev==1.5.0,usb.core:pyusb,${EXT_DEPS_OVERRIDES}" \
@@ -208,14 +210,14 @@ ONBUILD WORKDIR /opt/odoo/git
208210

209211
ONBUILD RUN set -ex; \
210212
isodoo_update_addons; \
211-
. ~/.venv/bin/activate; \
213+
. /home/odoo/.venv/bin/activate; \
212214
[ "$AUTO_DOWNLOAD_DEPENDENCIES" = true ] && isodoo_auto_fill_external_dependencies; \
213215
deactivate;
214216

215217
ONBUILD WORKDIR /opt/odoo
216218

217219
ONBUILD RUN set -ex; \
218-
. ~/.nvm/nvm.sh; \
220+
. "${NVM_DIR}/nvm.sh"; \
219221
xargs -r npm install -g < /opt/odoo/npm.txt;
220222

221223
ONBUILD USER root

‎11.0.Dockerfile‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ WORKDIR /home/odoo
8585

8686
# Install NodeJS & Depedencies
8787
ARG NVM_VERSION="v0.40.3" \
88+
NVM_DIR=/home/odoo/.nvm \
8889
NVM_INSTALL_SHA256="2d8359a64a3cb07c02389ad88ceecd43f2fa469c06104f92f98df5b6f315275f" \
8990
NODE_VERSION="6.17.1" \
9091
ODOO_NPM_PKGS="rtlcss less@3.10.3 less-plugin-clean-css"
@@ -95,7 +96,7 @@ RUN set -ex; \
9596
echo "${NVM_INSTALL_SHA256} install-nvm.sh" | sha256sum -c -; \
9697
bash install-nvm.sh; \
9798
rm install-nvm.sh; \
98-
. ~/.nvm/nvm.sh; \
99+
. "${NVM_DIR}/nvm.sh"; \
99100
nvm install "${NODE_VERSION}"; \
100101
nvm use "${NODE_VERSION}"; \
101102
npm install -g ${ODOO_NPM_PKGS}; \
@@ -126,7 +127,7 @@ WORKDIR /home/odoo
126127

127128
# Install System PIP & Extra dependencies
128129
RUN set -eux; \
129-
"$PYTHON_SYSTEM_BIN_NAME" -m venv ~/.venv; \
130+
"$PYTHON_SYSTEM_BIN_NAME" -m venv /home/odoo/.venv; \
130131
. .venv/bin/activate; \
131132
pip install --no-cache-dir --upgrade pip; \
132133
pip install --no-cache-dir click-odoo-contrib git-aggregator pyyaml psycopg2; \
@@ -176,7 +177,7 @@ USER odoo
176177

177178
# Verifications
178179
RUN set -ex; \
179-
. ~/.nvm/nvm.sh; \
180+
. "${NVM_DIR}/nvm.sh"; \
180181
wkhtmltopdf --version; \
181182
node --version; \
182183
/home/odoo/.venv/bin/python --version; \
@@ -189,6 +190,7 @@ ONBUILD ARG EXT_DEPS_OVERRIDES='' \
189190
AUTO_DOWNLOAD_DEPENDENCIES=true
190191
ONBUILD ENV LC_ALL="C.UTF-8" \
191192
LANG="C.UTF-8" \
193+
NVM_DIR=/home/odoo/.nvm \
192194
GIT_DEPTH_NORMAL=1 \
193195
GIT_DEPTH_MERGE=500 \
194196
EXT_DEPS_OVERRIDES="ldap:python-ldap,usb.core:pyusb,${EXT_DEPS_OVERRIDES}" \
@@ -210,14 +212,14 @@ ONBUILD WORKDIR /opt/odoo/git
210212

211213
ONBUILD RUN set -ex; \
212214
isodoo_update_addons; \
213-
. ~/.venv/bin/activate; \
215+
. /home/odoo/.venv/bin/activate; \
214216
[ "$AUTO_DOWNLOAD_DEPENDENCIES" = true ] && isodoo_auto_fill_external_dependencies; \
215217
deactivate;
216218

217219
ONBUILD WORKDIR /opt/odoo
218220

219221
ONBUILD RUN set -ex; \
220-
. ~/.nvm/nvm.sh; \
222+
. "${NVM_DIR}/nvm.sh"; \
221223
xargs -r npm install -g < /opt/odoo/npm.txt;
222224

223225
ONBUILD USER root

‎12.0.Dockerfile‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ WORKDIR /home/odoo
8585

8686
# Install NodeJS & Depedencies
8787
ARG NVM_VERSION="v0.40.3" \
88+
NVM_DIR=/home/odoo/.nvm \
8889
NVM_INSTALL_SHA256="2d8359a64a3cb07c02389ad88ceecd43f2fa469c06104f92f98df5b6f315275f" \
8990
NODE_VERSION="6.17.1" \
9091
ODOO_NPM_PKGS="rtlcss less@3.10.3 less-plugin-clean-css"
@@ -96,7 +97,7 @@ RUN set -ex; \
9697
echo "${NVM_INSTALL_SHA256} install-nvm.sh" | sha256sum -c -; \
9798
bash install-nvm.sh; \
9899
rm install-nvm.sh; \
99-
. /home/odoo/.nvm/nvm.sh; \
100+
. "${NVM_DIR}/nvm.sh"; \
100101
nvm install "${NODE_VERSION}"; \
101102
nvm use "${NODE_VERSION}"; \
102103
npm install -g ${ODOO_NPM_PKGS}; \
@@ -124,7 +125,7 @@ RUN set -eux; \
124125

125126
# Install System PIP & Extra dependencies
126127
RUN set -eux; \
127-
"$PYTHON_SYSTEM_BIN_NAME" -m venv ~/.venv; \
128+
"$PYTHON_SYSTEM_BIN_NAME" -m venv /home/odoo/.venv; \
128129
. .venv/bin/activate; \
129130
pip install --no-cache-dir --upgrade pip; \
130131
pip install --no-cache-dir click-odoo-contrib git-aggregator pyyaml psycopg2; \
@@ -174,7 +175,7 @@ USER odoo
174175

175176
# Verifications
176177
RUN set -ex; \
177-
. ~/.nvm/nvm.sh; \
178+
. "${NVM_DIR}/nvm.sh"; \
178179
wkhtmltopdf --version; \
179180
node --version; \
180181
/home/odoo/.venv/bin/python --version; \
@@ -187,6 +188,7 @@ ONBUILD ARG EXT_DEPS_OVERRIDES='' \
187188
AUTO_DOWNLOAD_DEPENDENCIES=true
188189
ONBUILD ENV LC_ALL="C.UTF-8" \
189190
LANG="C.UTF-8" \
191+
NVM_DIR=/home/odoo/.nvm \
190192
GIT_DEPTH_NORMAL=1 \
191193
GIT_DEPTH_MERGE=500 \
192194
EXT_DEPS_OVERRIDES="ldap:python-ldap,${EXT_DEPS_OVERRIDES}" \
@@ -208,14 +210,14 @@ ONBUILD WORKDIR /opt/odoo/git
208210

209211
ONBUILD RUN set -ex; \
210212
isodoo_update_addons; \
211-
. ~/.venv/bin/activate; \
213+
. /home/odoo/.venv/bin/activate; \
212214
[ "$AUTO_DOWNLOAD_DEPENDENCIES" = true ] && isodoo_auto_fill_external_dependencies; \
213215
deactivate;
214216

215217
ONBUILD WORKDIR /opt/odoo
216218

217219
ONBUILD RUN set -ex; \
218-
. ~/.nvm/nvm.sh; \
220+
. "${NVM_DIR}/nvm.sh"; \
219221
xargs -r npm install -g < /opt/odoo/npm.txt;
220222

221223
ONBUILD USER root

‎13.0.Dockerfile‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ WORKDIR /home/odoo
8585

8686
# Install NodeJS & Depedencies
8787
ARG NVM_VERSION="v0.40.3" \
88+
NVM_DIR=/home/odoo/.nvm \
8889
NVM_INSTALL_SHA256="2d8359a64a3cb07c02389ad88ceecd43f2fa469c06104f92f98df5b6f315275f" \
8990
NODE_VERSION="6.17.1" \
9091
ODOO_NPM_PKGS="rtlcss less@3.10.3 less-plugin-clean-css"
@@ -95,7 +96,7 @@ RUN set -ex; \
9596
echo "${NVM_INSTALL_SHA256} install-nvm.sh" | sha256sum -c -; \
9697
bash install-nvm.sh; \
9798
rm install-nvm.sh; \
98-
. /home/odoo/.nvm/nvm.sh; \
99+
. "${NVM_DIR}/nvm.sh"; \
99100
nvm install "${NODE_VERSION}"; \
100101
nvm use "${NODE_VERSION}"; \
101102
npm install -g ${ODOO_NPM_PKGS}; \
@@ -123,7 +124,7 @@ RUN set -eux; \
123124

124125
# Install System PIP & Extra dependencies
125126
RUN set -eux; \
126-
"$PYTHON_SYSTEM_BIN_NAME" -m venv ~/.venv; \
127+
"$PYTHON_SYSTEM_BIN_NAME" -m venv /home/odoo/.venv; \
127128
. .venv/bin/activate; \
128129
pip install --no-cache-dir --upgrade pip; \
129130
pip install --no-cache-dir click-odoo-contrib git-aggregator pyyaml psycopg2; \
@@ -173,7 +174,7 @@ USER odoo
173174

174175
# Verifications
175176
RUN set -ex; \
176-
. ~/.nvm/nvm.sh; \
177+
. "${NVM_DIR}/nvm.sh"; \
177178
wkhtmltopdf --version; \
178179
node --version; \
179180
/home/odoo/.venv/bin/python --version; \
@@ -186,6 +187,7 @@ ONBUILD ARG EXT_DEPS_OVERRIDES='' \
186187
AUTO_DOWNLOAD_DEPENDENCIES=true
187188
ONBUILD ENV LC_ALL="C.UTF-8" \
188189
LANG="C.UTF-8" \
190+
NVM_DIR=/home/odoo/.nvm \
189191
GIT_DEPTH_NORMAL=1 \
190192
GIT_DEPTH_MERGE=500 \
191193
EXT_DEPS_OVERRIDES="ldap:python-ldap,${EXT_DEPS_OVERRIDES}" \
@@ -207,14 +209,14 @@ ONBUILD WORKDIR /opt/odoo/git
207209

208210
ONBUILD RUN set -ex; \
209211
isodoo_update_addons; \
210-
. ~/.venv/bin/activate; \
212+
. /home/odoo/.venv/bin/activate; \
211213
[ "$AUTO_DOWNLOAD_DEPENDENCIES" = true ] && isodoo_auto_fill_external_dependencies; \
212214
deactivate;
213215

214216
ONBUILD WORKDIR /opt/odoo
215217

216218
ONBUILD RUN set -ex; \
217-
. ~/.nvm/nvm.sh; \
219+
. "${NVM_DIR}/nvm.sh"; \
218220
xargs -r npm install -g < /opt/odoo/npm.txt;
219221

220222
ONBUILD USER root

‎14.0.Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ WORKDIR /home/odoo
8585

8686
# Install NodeJS & Depedencies
8787
ARG NVM_VERSION="v0.40.3" \
88+
NVM_DIR=/home/odoo/.nvm \
8889
NVM_INSTALL_SHA256="2d8359a64a3cb07c02389ad88ceecd43f2fa469c06104f92f98df5b6f315275f" \
8990
NODE_VERSION="18.20.4" \
9091
ODOO_NPM_PKGS="rtlcss"
@@ -95,7 +96,7 @@ RUN set -ex; \
9596
echo "${NVM_INSTALL_SHA256} install-nvm.sh" | sha256sum -c -; \
9697
bash install-nvm.sh; \
9798
rm install-nvm.sh; \
98-
. /home/odoo/.nvm/nvm.sh; \
99+
. "${NVM_DIR}/nvm.sh"; \
99100
nvm install "${NODE_VERSION}"; \
100101
nvm use "${NODE_VERSION}"; \
101102
npm install -g ${ODOO_NPM_PKGS}; \
@@ -165,7 +166,7 @@ USER odoo
165166

166167
# Verifications
167168
RUN set -ex; \
168-
. ~/.nvm/nvm.sh; \
169+
. "${NVM_DIR}/nvm.sh"; \
169170
wkhtmltopdf --version; \
170171
node --version; \
171172
/home/odoo/.venv/bin/python --version; \
@@ -178,6 +179,7 @@ ONBUILD ARG EXT_DEPS_OVERRIDES='' \
178179
AUTO_DOWNLOAD_DEPENDENCIES=true
179180
ONBUILD ENV LC_ALL="C.UTF-8" \
180181
LANG="C.UTF-8" \
182+
NVM_DIR=/home/odoo/.nvm \
181183
GIT_DEPTH_NORMAL=1 \
182184
GIT_DEPTH_MERGE=500 \
183185
EXT_DEPS_OVERRIDES="ldap:python-ldap,${EXT_DEPS_OVERRIDES}" \
@@ -199,14 +201,14 @@ ONBUILD WORKDIR /opt/odoo/git
199201

200202
ONBUILD RUN set -ex; \
201203
isodoo_update_addons; \
202-
. ~/.venv/bin/activate; \
204+
. /home/odoo/.venv/bin/activate; \
203205
[ "$AUTO_DOWNLOAD_DEPENDENCIES" = true ] && isodoo_auto_fill_external_dependencies; \
204206
deactivate;
205207

206208
ONBUILD WORKDIR /opt/odoo
207209

208210
ONBUILD RUN set -ex; \
209-
. ~/.nvm/nvm.sh; \
211+
. "${NVM_DIR}/nvm.sh"; \
210212
xargs -r npm install -g < /opt/odoo/npm.txt;
211213

212214
ONBUILD USER root

‎15.0.Dockerfile‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ WORKDIR /home/odoo
8585

8686
# Install NodeJS & Depedencies
8787
ARG NVM_VERSION="v0.40.3" \
88-
NVM_INSTALL_SHA256="2d8359a64a3cb07c02389ad88ceecd43f2fa469c06104f92f98df5b6f315275f" \
88+
NVM_DIR=/home/odoo/.nvm \
89+
NVM_INSTALL_SHA256=2d8359a64a3cb07c02389ad88ceecd43f2fa469c06104f92f98df5b6f315275f \
8990
NODE_VERSION="18.20.4" \
9091
ODOO_NPM_PKGS="rtlcss"
9192

@@ -95,7 +96,7 @@ RUN set -ex; \
9596
echo "${NVM_INSTALL_SHA256} install-nvm.sh" | sha256sum -c -; \
9697
bash install-nvm.sh; \
9798
rm install-nvm.sh; \
98-
. /home/odoo/.nvm/nvm.sh; \
99+
. "${NVM_DIR}/nvm.sh"; \
99100
nvm install "${NODE_VERSION}"; \
100101
nvm use "${NODE_VERSION}"; \
101102
npm install -g ${ODOO_NPM_PKGS}; \
@@ -165,7 +166,7 @@ USER odoo
165166

166167
# Verifications
167168
RUN set -ex; \
168-
. ~/.nvm/nvm.sh; \
169+
. "${NVM_DIR}/nvm.sh"; \
169170
wkhtmltopdf --version; \
170171
node --version; \
171172
/home/odoo/.venv/bin/python --version; \
@@ -178,6 +179,7 @@ ONBUILD ARG EXT_DEPS_OVERRIDES='' \
178179
AUTO_DOWNLOAD_DEPENDENCIES=true
179180
ONBUILD ENV LC_ALL="C.UTF-8" \
180181
LANG="C.UTF-8" \
182+
NVM_DIR=/home/odoo/.nvm \
181183
GIT_DEPTH_NORMAL=1 \
182184
GIT_DEPTH_MERGE=500 \
183185
EXT_DEPS_OVERRIDES="ldap:python-ldap,${EXT_DEPS_OVERRIDES}" \
@@ -199,14 +201,14 @@ ONBUILD WORKDIR /opt/odoo/git
199201

200202
ONBUILD RUN set -ex; \
201203
isodoo_update_addons; \
202-
. ~/.venv/bin/activate; \
204+
. /home/odoo/.venv/bin/activate; \
203205
[ "$AUTO_DOWNLOAD_DEPENDENCIES" = true ] && isodoo_auto_fill_external_dependencies; \
204206
deactivate;
205207

206208
ONBUILD WORKDIR /opt/odoo
207209

208210
ONBUILD RUN set -ex; \
209-
. ~/.nvm/nvm.sh; \
211+
. "${NVM_DIR}/nvm.sh"; \
210212
xargs -r npm install -g < /opt/odoo/npm.txt;
211213

212214
ONBUILD USER root

‎16.0.Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ WORKDIR /home/odoo
8585

8686
# Install NodeJS & Depedencies
8787
ARG NVM_VERSION="v0.40.3" \
88+
NVM_DIR=/home/odoo/.nvm \
8889
NVM_INSTALL_SHA256="2d8359a64a3cb07c02389ad88ceecd43f2fa469c06104f92f98df5b6f315275f" \
8990
NODE_VERSION="18.20.4" \
9091
ODOO_NPM_PKGS="rtlcss"
@@ -95,7 +96,7 @@ RUN set -ex; \
9596
echo "${NVM_INSTALL_SHA256} install-nvm.sh" | sha256sum -c -; \
9697
bash install-nvm.sh; \
9798
rm install-nvm.sh; \
98-
. /home/odoo/.nvm/nvm.sh; \
99+
. "${NVM_DIR}/nvm.sh"; \
99100
nvm install "${NODE_VERSION}"; \
100101
nvm use "${NODE_VERSION}"; \
101102
npm install -g ${ODOO_NPM_PKGS}; \
@@ -166,7 +167,7 @@ USER odoo
166167

167168
# Verifications
168169
RUN set -ex; \
169-
. ~/.nvm/nvm.sh; \
170+
. "${NVM_DIR}/nvm.sh"; \
170171
wkhtmltopdf --version; \
171172
node --version; \
172173
/home/odoo/.venv/bin/python --version; \
@@ -179,6 +180,7 @@ ONBUILD ARG EXT_DEPS_OVERRIDES='' \
179180
AUTO_DOWNLOAD_DEPENDENCIES=true
180181
ONBUILD ENV LC_ALL="C.UTF-8" \
181182
LANG="C.UTF-8" \
183+
NVM_DIR=/home/odoo/.nvm \
182184
GIT_DEPTH_NORMAL=1 \
183185
GIT_DEPTH_MERGE=500 \
184186
EXT_DEPS_OVERRIDES="ldap:python-ldap,${EXT_DEPS_OVERRIDES}" \
@@ -200,14 +202,14 @@ ONBUILD WORKDIR /opt/odoo/git
200202

201203
ONBUILD RUN set -ex; \
202204
isodoo_update_addons; \
203-
. ~/.venv/bin/activate; \
205+
. /home/odoo/.venv/bin/activate; \
204206
[ "$AUTO_DOWNLOAD_DEPENDENCIES" = true ] && isodoo_auto_fill_external_dependencies; \
205207
deactivate;
206208

207209
ONBUILD WORKDIR /opt/odoo
208210

209211
ONBUILD RUN set -ex; \
210-
. ~/.nvm/nvm.sh; \
212+
. "${NVM_DIR}/nvm.sh"; \
211213
xargs -r npm install -g < /opt/odoo/npm.txt;
212214

213215
ONBUILD USER root

0 commit comments

Comments
 (0)