Skip to content

Commit

Permalink
feat: switch to github + bump library + bump python libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
vrenaville committed Sep 11, 2024
1 parent 64f9710 commit dbdcebe
Show file tree
Hide file tree
Showing 41 changed files with 438 additions and 913 deletions.
98 changes: 98 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
name: build

on:
push:
branches:
- "release-4.5.X"
- "dev-4.5.X"
tags:
- "4.*.*.*.*"

pull_request:
branches:
- "release-4.5.X"


env:
TARGET: GHCR
DOCKER_BUILDKIT: 1
COMPOSE_DOCKER_CLI_BUILD: 1

jobs:

build:
runs-on: ubuntu-latest
strategy:
matrix:
#odoo_serie: ["11.0","12.0", "13.0", "14.0", "15.0", "16.0", "17.0"]
odoo_serie: ["13.0"]

steps:
- uses: actions/checkout@v4
with:
ref: dev-4.5.X

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
with:
driver: docker

- name: Docker meta
id: docker_meta
uses: docker/metadata-action@v4
with:
images: ghcr.io/camptocamp/docker-odoo-project
flavor: |
prefix=${{ matrix.odoo_serie }}-old-flavour,onlatest=true
tags: |
type=raw,value={{branch}}-old-flavour-latest
type=raw,value={{branch}}-old-flavour-{{date 'YYYYMMDD'}}
type=ref,event=tag
type=ref,event=pr
type=schedule,pattern=nightly
type=raw,value={{branch}}-old-flavour
- name: Setup build dir
run: |
VERSION=${{ matrix.odoo_serie }} SRC=build make setup
- name: Build
uses: docker/build-push-action@v3
with:
context: ./build
push: false
load: true
tags: ci-latest:0.1
labels: ${{ steps.docker_meta.outputs.labels }}

- name: Setup build dir
run: |
docker image ls
- name: Test
run: make VERSION=${{ matrix.odoo_serie }} test

- name: Login to GitHub Container Registry
if: github.event_name == 'push' || github.event_name == 'schedule'
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ secrets.GHCR_USER }}
password: ${{ secrets.GHCR_TOKEN }}

- name: Tag & Push
if: github.event_name == 'push' || github.event_name == 'schedule'
id: docker_push
uses: docker/build-push-action@v3
with:
context: ./build
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}

- name: Image digest
run: echo ${{ steps.docker_push.outputs.digest }}


37 changes: 0 additions & 37 deletions .travis.yml

This file was deleted.

7 changes: 3 additions & 4 deletions 11.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster
FROM python:3.7-slim-bookworm
MAINTAINER Camptocamp

# create the working directory and a place to set the logs (if wanted)
Expand All @@ -16,7 +16,6 @@ ENV LANG=C.UTF-8 \
ENV BUILD_PACKAGE \
build-essential \
gcc \
python3.7-dev \
libevent-dev \
libfreetype6-dev \
libxml2-dev \
Expand All @@ -31,13 +30,13 @@ ENV BUILD_PACKAGE \

# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
RUN set -x; \
/install/package_odoo_12.0-buster.sh \
/install/package_odoo.sh \
&& /install/setup-pip.sh \
&& /install/postgres.sh \
&& /install/kwkhtml_client.sh \
&& /install/kwkhtml_client_force_python3.sh \
&& /install/dev_package.sh \
&& python3 -m pip install --force-reinstall pip "setuptools<58" \
&& python3 -m pip install --force-reinstall pip \
&& pip3 install -r /odoo/base_requirements.txt --ignore-installed \
&& /install/purge_dev_package_and_cache.sh \
&& /install/reportlab_init.sh
Expand Down
7 changes: 3 additions & 4 deletions 12.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster
FROM python:3.9-slim-bookworm
MAINTAINER Camptocamp

# create the working directory and a place to set the logs (if wanted)
Expand All @@ -16,7 +16,6 @@ ENV LANG=C.UTF-8 \
ENV BUILD_PACKAGE \
build-essential \
gcc \
python3.7-dev \
libevent-dev \
libfreetype6-dev \
libxml2-dev \
Expand All @@ -31,13 +30,13 @@ ENV BUILD_PACKAGE \

# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
RUN set -x; \
/install/package_odoo_12.0-buster.sh \
/install/package_odoo.sh \
&& /install/setup-pip.sh \
&& /install/postgres.sh \
&& /install/kwkhtml_client.sh \
&& /install/kwkhtml_client_force_python3.sh \
&& /install/dev_package.sh \
&& python3 -m pip install --force-reinstall pip "setuptools<58" \
&& python3 -m pip install --force-reinstall pip \
&& pip3 install -r /odoo/base_requirements.txt --ignore-installed \
&& /install/purge_dev_package_and_cache.sh

Expand Down
3 changes: 1 addition & 2 deletions 12.0/base_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ passlib==1.6.5
Pillow==8.1.1 ; python_version >= '3.7' # official 6.1.0
psutil==5.7.0; sys_platform != 'win32' # official 4.3.1
# psutil==5.6.3; sys_platform == 'win32'
psycopg2==2.7.3.1; sys_platform != 'win32' and python_version < '3.8'
# psycopg2==2.8.3; sys_platform == 'win32' or python_version >= '3.8'
psycopg2==2.8.3; sys_platform == 'win32' or python_version >= '3.8'
pydot==1.2.3
pyldap==2.4.28; sys_platform != 'win32'
pyparsing==2.1.10
Expand Down
5 changes: 2 additions & 3 deletions 13.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster
FROM python:3.9-slim-bookworm
MAINTAINER Camptocamp

# create the working directory and a place to set the logs (if wanted)
Expand All @@ -16,7 +16,6 @@ ENV LANG=C.UTF-8 \
ENV BUILD_PACKAGE \
build-essential \
gcc \
python3.7-dev \
libevent-dev \
libfreetype6-dev \
libxml2-dev \
Expand All @@ -31,7 +30,7 @@ ENV BUILD_PACKAGE \

# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
RUN set -x; \
sh -c /install/package_odoo_13.0_14.0.sh \
sh -c /install/package_odoo.sh \
&& /install/setup-pip.sh \
&& /install/postgres.sh \
&& /install/kwkhtml_client.sh \
Expand Down
18 changes: 7 additions & 11 deletions 13.0/base_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,16 @@ chardet==3.0.4
decorator==4.3.0
docutils==0.14
ebaysdk==2.1.5
# gevent==1.1.2 ; sys_platform != 'win32' and python_version < '3.7'
gevent==1.5.0 ; python_version >= '3.7'
# gevent==1.4.0 ; sys_platform == 'win32' and python_version < '3.7'
greenlet==0.4.10 ; python_version < '3.7'
greenlet==0.4.15 ; python_version >= '3.7'
gevent==22.10.2
greenlet==2.0.2
html2text==2018.1.9
Jinja2==2.11.3 # official 2.10.1
Jinja2==3.1.4 # official 2.10.1
libsass==0.17.0
# lxml==3.7.1 ; sys_platform != 'win32' and python_version < '3.7'
lxml==4.6.3 ; sys_platform != 'win32' and python_version >= '3.7' # official 4.3.2
# lxml ; sys_platform == 'win32'
Mako==1.0.7
MarkupSafe==1.1.1 # official 1.1.0
Mako==1.3.5
MarkupSafe==2.1.5 # official 1.1.0
mock==2.0.0
num2words==0.5.10 # official 0.5.6
ofxparse==0.19
Expand All @@ -29,8 +26,7 @@ Pillow==8.3.2 ; python_version < '3.7' or sys_platform != 'win32' # official 5.4
# Pillow==6.1.0 ; sys_platform == 'win32' and python_version >= '3.7'
polib==1.1.0
psutil==5.7.0; sys_platform != 'win32'
psycopg2==2.7.7; sys_platform != 'win32' and python_version < '3.8'
# psycopg2==2.8.3; sys_platform == 'win32' or python_version >= '3.8'
psycopg2==2.8.3; sys_platform == 'win32' or python_version >= '3.8'
pydot==1.4.1
python-ldap==3.2.0; sys_platform != 'win32' # official 3.1.0
pyparsing==2.2.0
Expand All @@ -45,7 +41,7 @@ requests==2.25.1 # official 2.21.0
zeep==3.2.0
vatnumber==1.2
vobject==0.9.6.1
Werkzeug==0.16.1 ; sys_platform != 'win32' # official 0.14.1
Werkzeug==2.3.8 ; sys_platform != 'win32' # official 0.14.1
# Werkzeug==0.16.0 ; sys_platform == 'win32'
XlsxWriter==1.1.2
xlwt==1.3.*
Expand Down
78 changes: 0 additions & 78 deletions 14.0-bullseye/Dockerfile

This file was deleted.

1 change: 0 additions & 1 deletion 14.0-bullseye/MANIFEST.in

This file was deleted.

Loading

0 comments on commit dbdcebe

Please sign in to comment.