From 84f6d0f26855d18be7a46f7a4f44c893a26eef2f Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Mon, 11 Jan 2021 08:25:39 -0800 Subject: [PATCH] [REM] Dockerfile: git and openupgrade, provided up upstream image built for Odoo now --- Dockerfile | 14 -------------- Dockerfile-GitLab | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/Dockerfile b/Dockerfile index 427e61d0..6f84391a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,5 @@ FROM hibou/hibou-odoo:12.0 -# All this just for openupgradelib -USER 0 -RUN set -x; \ - apt update && apt install -y git \ - && pip install git+git://github.com/OCA/openupgradelib.git \ - # Clean Up - && apt remove -y git \ - && apt autoremove -y \ - && rm -rf /root/.cache \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* \ - && rm -rf /tmp/* \ - ; - USER 104 COPY --from=hibou/flow /flow /flow COPY --chown=104 entrypoint.sh /entrypoint.sh diff --git a/Dockerfile-GitLab b/Dockerfile-GitLab index 63519903..6680edec 100644 --- a/Dockerfile-GitLab +++ b/Dockerfile-GitLab @@ -1,19 +1,5 @@ FROM registry.gitlab.com/hibou-io/hibou-odoo/odoo:RELEASE -# All this just for openupgradelib -USER 0 -RUN set -x; \ - apt update && apt install -y git \ - && pip install git+git://github.com/OCA/openupgradelib.git \ - # Clean Up - && apt remove -y git \ - && apt autoremove -y \ - && rm -rf /root/.cache \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* \ - && rm -rf /tmp/* \ - ; - USER 104 COPY --from=registry.gitlab.com/hibou-io/hibou-odoo/flow /flow /flow COPY --chown=104 entrypoint.sh /entrypoint.sh