From 1c258e08ea1166786d4e98f2aa87f53063dc0088 Mon Sep 17 00:00:00 2001 From: hparfr Date: Fri, 4 Oct 2024 15:20:37 +0200 Subject: [PATCH 1/2] adapt to new maintainer syntax for 16+ --- 16.0-light/Dockerfile | 2 +- 17.0-light/Dockerfile | 2 +- 18.0-light/Dockerfile | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/16.0-light/Dockerfile b/16.0-light/Dockerfile index 7e10769..1a9192e 100644 --- a/16.0-light/Dockerfile +++ b/16.0-light/Dockerfile @@ -1,7 +1,7 @@ # python 3.10 is the default used in acsone FROM ghcr.io/acsone/odoo-bedrock:16.0-py310-latest ARG PYTHONBIN=python3.10 -MAINTAINER Akretion +LABEL org.opencontainers.image.authors="Akretion" # syntax = docker/dockerfile:1.4 diff --git a/17.0-light/Dockerfile b/17.0-light/Dockerfile index 1bff7c9..e22b7bc 100644 --- a/17.0-light/Dockerfile +++ b/17.0-light/Dockerfile @@ -1,6 +1,6 @@ FROM ghcr.io/acsone/odoo-bedrock:17.0-py311-jammy-latest ARG PYTHONBIN=python3.11 -MAINTAINER Akretion +LABEL org.opencontainers.image.authors="Akretion" # syntax = docker/dockerfile:1.4 diff --git a/18.0-light/Dockerfile b/18.0-light/Dockerfile index 7e46ebb..d2aa0fd 100644 --- a/18.0-light/Dockerfile +++ b/18.0-light/Dockerfile @@ -1,7 +1,6 @@ FROM ghcr.io/acsone/odoo-bedrock:18.0-py312-noble-latest ARG PYTHONBIN=python3.12 -MAINTAINER Akretion - +LABEL org.opencontainers.image.authors="Akretion" # syntax = docker/dockerfile:1.4 # List from https://github.com/camptocamp/docker-odoo-project/blob/master/16.0/Dockerfile From 8470a9b979de28683d0f66a9eb39f39f8fc1c184 Mon Sep 17 00:00:00 2001 From: hparfr Date: Fri, 4 Oct 2024 15:21:50 +0200 Subject: [PATCH 2/2] change workdir for odoo v18+ since v18 do not work well if run from / we need this from entrypoint --- 18.0-light/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/18.0-light/Dockerfile b/18.0-light/Dockerfile index d2aa0fd..80ff9db 100644 --- a/18.0-light/Dockerfile +++ b/18.0-light/Dockerfile @@ -34,4 +34,5 @@ RUN pip install --no-cache-dir -r /tmp/base_requirements.txt COPY 18.0-light/ak_requirements.txt /tmp/ak_requirements.txt RUN pip install --no-cache-dir -r /tmp/ak_requirements.txt +WORKDIR /odoo CMD ["odoo"]