Skip to content

Commit

Permalink
Upgrade to focal and add python 3.10
Browse files Browse the repository at this point in the history
  • Loading branch information
sbidoul committed May 12, 2022
1 parent b4e9bd5 commit 1e01fa1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:20.04

# some environment variables
ENV LANG=C.UTF-8 \
Expand Down Expand Up @@ -30,6 +30,8 @@ RUN set -x \
python3.8-venv \
python3.9 \
python3.9-venv \
python3.10 \
python3.10-venv \
postgresql-client \
# expect provides the unbuffer utility
tcl \
Expand All @@ -46,16 +48,15 @@ RUN set -x \
# gettext to manipulate .pot, .po files
gettext \
# wkhtmltopdf
&& wget -q -O /tmp/wkhtmltox.deb https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.bionic_amd64.deb \
&& echo "f1689a1b302ff102160f2693129f789410a1708a /tmp/wkhtmltox.deb" | sha1sum -c - \
&& wget -q -O /tmp/wkhtmltox.deb https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb \
&& echo "ad0264869fe40ccfb91c32e9be7318bfabf3864f6a8a15567f7a38afe4a9a932 /tmp/wkhtmltox.deb" | sha256sum -c - \
&& apt -y install /tmp/wkhtmltox.deb \
&& rm -f /tmp/wkhtmltox.deb \
# cleanup
&& rm -fr /var/lib/apt/lists/*

# Install pipx, which we use to install other python tools.
ENV PIPX_BIN_DIR=/usr/local/bin
ENV PIPX_DEFAULT_PYTHON=/usr/bin/python3.8
ENV PIPX_HOME=/opt/pipx
RUN python3 -m venv /opt/pipx/venv \
&& /opt/pipx/venv/bin/pip install --no-cache-dir pipx \
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ACSONE docker image for running Odoo CI workloads

This Odoo image has the following characteristics:

- Based on Ubuntu 18.04.
- Based on Ubuntu 20.04.
- Minimal dependencies to run ACSONE Odoo CI jobs

- git (with user.name=GitLab and [email protected])
Expand All @@ -12,7 +12,7 @@ This Odoo image has the following characteristics:
- openssh-client
- rsync
- make
- python2.7/3.5/3.6/3.7/3.8/3.9
- python2.7/3.5/3.6/3.7/3.8/3.9/3.10
- virtualenv
- postgresql client
- lessc
Expand All @@ -28,7 +28,7 @@ This Odoo image has the following characteristics:

- disable strict host key checking

- Odoo 8, 9, 10, 11, 12, 13, 14 are supported.
- Odoo 8, 9, 10, 11, 12, 13, 14, 15 are supported.
- Odoo is *not* preinstalled.
- Runs as non-privileged user named ``gitlab-runner``

Expand Down

0 comments on commit 1e01fa1

Please sign in to comment.