Skip to content

Commit 248c416

Browse files
committed
fix: create ./odoo/addons, ./odoo/filestore, ./odoo/sessions inside /odoo/data
Fixes #242 Also do not create temporary home /home/odoo
1 parent 52f590a commit 248c416

File tree

5 files changed

+45
-25
lines changed

5 files changed

+45
-25
lines changed

14.0/Dockerfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@ ARG GID=0
44

55

66
# create the working directory and a place to set the logs (if wanted)
7-
RUN adduser --disabled-password -u $UID --gid $GID --gecos '' odoo \
8-
&& install -m 770 -o odoo -d /odoo /odoo/data /var/log/odoo /odoo/.venv \
9-
/odoo/data/odoo /odoo/data/odoo/{addons,filestore,sessions} \
7+
RUN adduser --disabled-password --no-create-home \
8+
--home /odoo --gecos '' -u $UID --gid $GID odoo \
9+
&& install -m 770 -o odoo -d /odoo /var/log/odoo /odoo/.venv \
10+
/odoo/data \
11+
/odoo/data/odoo \
12+
/odoo/data/odoo/addons \
13+
/odoo/data/odoo/filestore \
14+
/odoo/data/odoo/sessions \
1015
&& install -m 660 -o odoo /dev/null /odoo/odoo.cfg \
11-
&& install -m 660 -o odoo /dev/null /odoo/.bashrc \
12-
&& usermod odoo --home /odoo
16+
&& install -m 660 -o odoo /dev/null /odoo/.bashrc
1317

1418
COPY --chown=odoo:root --chmod=770 ./install /install
1519
COPY --chown=odoo:root --chmod=660 ./base_requirements.txt /odoo

15.0/Dockerfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@ ARG GID=0
44

55

66
# create the working directory and a place to set the logs (if wanted)
7-
RUN adduser --disabled-password -u $UID --gid $GID --gecos '' odoo \
8-
&& install -m 770 -o odoo -d /odoo /odoo/data /var/log/odoo /odoo/.venv \
9-
/odoo/data/odoo /odoo/data/odoo/{addons,filestore,sessions} \
7+
RUN adduser --disabled-password --no-create-home \
8+
--home /odoo --gecos '' -u $UID --gid $GID odoo \
9+
&& install -m 770 -o odoo -d /odoo /var/log/odoo /odoo/.venv \
10+
/odoo/data \
11+
/odoo/data/odoo \
12+
/odoo/data/odoo/addons \
13+
/odoo/data/odoo/filestore \
14+
/odoo/data/odoo/sessions \
1015
&& install -m 660 -o odoo /dev/null /odoo/odoo.cfg \
11-
&& install -m 660 -o odoo /dev/null /odoo/.bashrc \
12-
&& usermod odoo --home /odoo
16+
&& install -m 660 -o odoo /dev/null /odoo/.bashrc
1317

1418
COPY --chown=odoo:root --chmod=770 ./install /install
1519
COPY --chown=odoo:root --chmod=660 ./base_requirements.txt /odoo

16.0/Dockerfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@ ARG GID=0
44

55

66
# create the working directory and a place to set the logs (if wanted)
7-
RUN adduser --disabled-password -u $UID --gid $GID --gecos '' odoo \
8-
&& install -m 770 -o odoo -d /odoo /odoo/data /var/log/odoo /odoo/.venv \
9-
/odoo/data/odoo /odoo/data/odoo/{addons,filestore,sessions} \
7+
RUN adduser --disabled-password --no-create-home \
8+
--home /odoo --gecos '' -u $UID --gid $GID odoo \
9+
&& install -m 770 -o odoo -d /odoo /var/log/odoo /odoo/.venv \
10+
/odoo/data \
11+
/odoo/data/odoo \
12+
/odoo/data/odoo/addons \
13+
/odoo/data/odoo/filestore \
14+
/odoo/data/odoo/sessions \
1015
&& install -m 660 -o odoo /dev/null /odoo/odoo.cfg \
11-
&& install -m 660 -o odoo /dev/null /odoo/.bashrc \
12-
&& usermod odoo --home /odoo
16+
&& install -m 660 -o odoo /dev/null /odoo/.bashrc
1317

1418
COPY --chown=odoo:root --chmod=770 ./install /install
1519
COPY --chown=odoo:root --chmod=660 ./base_requirements.txt /odoo

17.0/Dockerfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@ ARG GID=0
44

55

66
# create the working directory and a place to set the logs (if wanted)
7-
RUN adduser --disabled-password -u $UID --gid $GID --gecos '' odoo \
8-
&& install -m 770 -o odoo -d /odoo /odoo/data /var/log/odoo /odoo/.venv \
9-
/odoo/data/odoo /odoo/data/odoo/{addons,filestore,sessions} \
7+
RUN adduser --disabled-password --no-create-home \
8+
--home /odoo --gecos '' -u $UID --gid $GID odoo \
9+
&& install -m 770 -o odoo -d /odoo /var/log/odoo /odoo/.venv \
10+
/odoo/data \
11+
/odoo/data/odoo \
12+
/odoo/data/odoo/addons \
13+
/odoo/data/odoo/filestore \
14+
/odoo/data/odoo/sessions \
1015
&& install -m 660 -o odoo /dev/null /odoo/odoo.cfg \
11-
&& install -m 660 -o odoo /dev/null /odoo/.bashrc \
12-
&& usermod odoo --home /odoo
16+
&& install -m 660 -o odoo /dev/null /odoo/.bashrc
1317

1418
COPY --chown=odoo:root --chmod=770 ./install /install
1519
COPY --chown=odoo:root --chmod=660 ./base_requirements.txt /odoo

18.0/Dockerfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@ ARG GID=0
44

55

66
# create the working directory and a place to set the logs (if wanted)
7-
RUN adduser --disabled-password -u $UID --gid $GID --gecos '' odoo \
8-
&& install -m 770 -o odoo -d /odoo /odoo/data /var/log/odoo /odoo/.venv \
9-
/odoo/data/odoo /odoo/data/odoo/{addons,filestore,sessions} \
7+
RUN adduser --disabled-password --no-create-home \
8+
--home /odoo --gecos '' -u $UID --gid $GID odoo \
9+
&& install -m 770 -o odoo -d /odoo /var/log/odoo /odoo/.venv \
10+
/odoo/data \
11+
/odoo/data/odoo \
12+
/odoo/data/odoo/addons \
13+
/odoo/data/odoo/filestore \
14+
/odoo/data/odoo/sessions \
1015
&& install -m 660 -o odoo /dev/null /odoo/odoo.cfg \
11-
&& install -m 660 -o odoo /dev/null /odoo/.bashrc \
12-
&& usermod odoo --home /odoo
16+
&& install -m 660 -o odoo /dev/null /odoo/.bashrc
1317

1418
COPY --chown=odoo:root --chmod=770 ./install /install
1519
COPY --chown=odoo:root --chmod=660 ./base_requirements.txt /odoo

0 commit comments

Comments
 (0)