Skip to content

Commit 7e1d32a

Browse files
Revert Dockerfile to use Python 2.7 and clean up comments and commands
1 parent 312e8da commit 7e1d32a

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

Dockerfile

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Odoo 8.0 Dockerfile
2-
FROM python:3.8-slim
1+
# Odoo 8.0 Dockerfile (Python 2.7)
2+
FROM python:2.7-slim
33

44
# Install system dependencies
55
RUN apt-get update \
@@ -22,8 +22,7 @@ RUN apt-get update \
2222
ca-certificates \
2323
fonts-dejavu-core \
2424
fonts-dejavu-extra \
25-
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/cache/apt/* \
26-
&& rm -rf /var/lib/apt/lists/*
25+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/cache/apt/*
2726

2827
# Install Python dependencies
2928
RUN pip install --no-cache-dir \
@@ -58,28 +57,24 @@ RUN pip install --no-cache-dir \
5857
num2words==0.5.4 \
5958
pillow==2.6.1
6059

61-
# Clone Odoo 8.0 from official repo
6260
# Clone Odoo 8.0 from official repo at a specific commit for reproducibility
6361
ARG ODOO_COMMIT=8c5e3c2c7e7c3e2e2b7e2d2e2c7e3c2e2b7e2d2e
6462
RUN git clone --branch 8.0 https://www.github.com/odoo/odoo /odoo \
6563
&& cd /odoo \
6664
&& git checkout ${ODOO_COMMIT}
65+
6766
# Use bash as the default shell
6867
SHELL ["/bin/bash", "-c"]
6968

70-
# Add entrypoint script
71-
COPY ./entrypoint.sh /entrypoint.sh
72-
RUN chmod +x /entrypoint.sh
7369
# Add entrypoint script
7470
COPY ./entrypoint.sh /entrypoint.sh
7571
RUN chmod +x /entrypoint.sh
7672

7773
# Expose Odoo port
7874
EXPOSE 8069
79-
CMD ["/odoo/openerp-server"]
80-
# Default command
75+
76+
# Default command and entrypoint
8177
ENTRYPOINT ["/entrypoint.sh"]
82-
CMD ["openerp-server"]
8378

8479
# Odoo version
8580
LABEL version="8.0.1.0"

0 commit comments

Comments
 (0)