From e4817f864108b744411ad5c86fb21994ab9f2a65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Sep 2021 01:19:02 +0000 Subject: [PATCH 01/12] Bump virtualenv from 20.7.2 to 20.8.0 Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.7.2 to 20.8.0. - [Release notes](https://github.com/pypa/virtualenv/releases) - [Changelog](https://github.com/pypa/virtualenv/blob/main/docs/changelog.rst) - [Commits](https://github.com/pypa/virtualenv/compare/20.7.2...20.8.0) --- updated-dependencies: - dependency-name: virtualenv dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 652d84ac..f3cd2b6f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,7 +2,7 @@ setuptools==50.3.2 pip==20.3 flake8==3.9.2 pydocstyle==5.1.1 -virtualenv==20.7.2 +virtualenv==20.8.0 coverage==5.5 gitchangelog==3.0.4 bumpversion==0.6.0 From 5272dd22c0afc64df1266adb8207a31e857a2499 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Sep 2021 01:19:22 +0000 Subject: [PATCH 02/12] Bump tox from 3.24.3 to 3.24.4 Bumps [tox](https://github.com/tox-dev/tox) from 3.24.3 to 3.24.4. - [Release notes](https://github.com/tox-dev/tox/releases) - [Changelog](https://github.com/tox-dev/tox/blob/master/docs/changelog.rst) - [Commits](https://github.com/tox-dev/tox/compare/3.24.3...3.24.4) --- updated-dependencies: - dependency-name: tox dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 652d84ac..304541ca 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -8,5 +8,5 @@ gitchangelog==3.0.4 bumpversion==0.6.0 pystache==0.5.4 wheel==0.37.0 -tox==3.24.3 +tox==3.24.4 coveralls==3.2.0 From f749bfc4a26466dd60549a215d3898bb645d7884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Alejandro=20Mart=C3=ADnez=20Faneyth?= Date: Sun, 19 Sep 2021 21:26:45 -0400 Subject: [PATCH 03/12] [REF] Changing action day. --- .github/dependabot.yml | 2 ++ .github/workflows/code-quality.yml | 2 +- .github/workflows/schedule-master.yml | 2 +- .github/workflows/schedule-master.yml.template | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8258c8aa..c527eb58 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,6 +4,7 @@ updates: directory: "/" schedule: interval: weekly + day: thursday time: "01:00" ignore: - dependency-name: setuptools @@ -20,5 +21,6 @@ updates: directory: "/" schedule: interval: weekly + day: thursday time: "01:00" open-pull-requests-limit: 99 \ No newline at end of file diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 5dfb5911..5866d4f9 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -2,7 +2,7 @@ name: Code Quality on: schedule: - - cron: '00 3 * * 1' + - cron: '00 3 * * 4' jobs: build: diff --git a/.github/workflows/schedule-master.yml b/.github/workflows/schedule-master.yml index e261705e..bff205c9 100644 --- a/.github/workflows/schedule-master.yml +++ b/.github/workflows/schedule-master.yml @@ -2,7 +2,7 @@ name: Schedule (master branch) on: schedule: - - cron: '00 3 * * 1' + - cron: '00 3 * * 4' jobs: build: diff --git a/.github/workflows/schedule-master.yml.template b/.github/workflows/schedule-master.yml.template index ab0066f5..f843e846 100644 --- a/.github/workflows/schedule-master.yml.template +++ b/.github/workflows/schedule-master.yml.template @@ -2,7 +2,7 @@ name: Schedule (master branch) on: schedule: - - cron: '00 3 * * 1' + - cron: '00 3 * * 4' jobs: build: From b7a7453dc605296da3d40c03753ce7854fdedf70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 01:03:14 +0000 Subject: [PATCH 04/12] Bump actions/github-script from 4.1 to 5 Bumps [actions/github-script](https://github.com/actions/github-script) from 4.1 to 5. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v4.1...v5) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0e4e587d..5ad628df 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -61,7 +61,7 @@ jobs: needs: approve steps: - name: Merge - uses: actions/github-script@v4.1 + uses: actions/github-script@v5 if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' with: github-token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}" @@ -72,7 +72,7 @@ jobs: pull_number: context.payload.pull_request.number }) - name: Merge - uses: actions/github-script@v4.1 + uses: actions/github-script@v5 if: github.actor == 'LuisAlejandro' with: github-token: "${{ secrets.GITHUB_TOKEN }}" From d1ce51045c36afd5f0bc87064ee4b6ee43e77c99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 01:03:19 +0000 Subject: [PATCH 05/12] Bump virtualenv from 20.8.0 to 20.8.1 Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.8.0 to 20.8.1. - [Release notes](https://github.com/pypa/virtualenv/releases) - [Changelog](https://github.com/pypa/virtualenv/blob/main/docs/changelog.rst) - [Commits](https://github.com/pypa/virtualenv/compare/20.8.0...20.8.1) --- updated-dependencies: - dependency-name: virtualenv dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 739bdc26..2b808709 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,7 +2,7 @@ setuptools==50.3.2 pip==20.3 flake8==3.9.2 pydocstyle==5.1.1 -virtualenv==20.8.0 +virtualenv==20.8.1 coverage==5.5 gitchangelog==3.0.4 bumpversion==0.6.0 From 1765bf75d12a85f0f665a240dad061c4d8f216fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Alejandro=20Mart=C3=ADnez=20Faneyth?= Date: Sat, 13 Nov 2021 14:33:37 -0400 Subject: [PATCH 06/12] [FIX] Fixing github builds. --- .gitchangelog.rc | 4 ++-- .github/workflows/pr.yml | 8 ++++---- requirements-dev.txt | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitchangelog.rc b/.gitchangelog.rc index ce067014..b622f220 100644 --- a/.gitchangelog.rc +++ b/.gitchangelog.rc @@ -153,8 +153,8 @@ unreleased_version_label = "%%version%% (unreleased)" ## #output_engine = rest_py #output_engine = mustache("restructuredtext") -output_engine = mustache("markdown") -#output_engine = makotemplate("restructuredtext") +#output_engine = mustache("markdown") +output_engine = makotemplate("markdown") ## ``include_merge`` is a boolean diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0e4e587d..9ed095c1 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -61,23 +61,23 @@ jobs: needs: approve steps: - name: Merge - uses: actions/github-script@v4.1 + uses: actions/github-script@v5 if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' with: github-token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}" script: | - await github.pulls.merge({ + await github.rest.pulls.merge({ owner: context.repo.owner, repo: context.repo.repo, pull_number: context.payload.pull_request.number }) - name: Merge - uses: actions/github-script@v4.1 + uses: actions/github-script@v5 if: github.actor == 'LuisAlejandro' with: github-token: "${{ secrets.GITHUB_TOKEN }}" script: | - await github.pulls.merge({ + await github.rest.pulls.merge({ owner: context.repo.owner, repo: context.repo.repo, pull_number: context.payload.pull_request.number diff --git a/requirements-dev.txt b/requirements-dev.txt index 739bdc26..a07b9639 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,7 +6,7 @@ virtualenv==20.8.0 coverage==5.5 gitchangelog==3.0.4 bumpversion==0.6.0 -pystache==0.5.4 +mako==1.1.5 wheel==0.37.0 tox==3.24.4 -coveralls==3.2.0 +coveralls==3.3.1 From 50166ed5f3979cf32ec73b18a876044d42980fb0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Nov 2021 18:35:04 +0000 Subject: [PATCH 07/12] Bump virtualenv from 20.8.1 to 20.10.0 Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.8.1 to 20.10.0. - [Release notes](https://github.com/pypa/virtualenv/releases) - [Changelog](https://github.com/pypa/virtualenv/blob/main/docs/changelog.rst) - [Commits](https://github.com/pypa/virtualenv/compare/20.8.1...20.10.0) --- updated-dependencies: - dependency-name: virtualenv dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 479b9985..1c109695 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,7 +2,7 @@ setuptools==50.3.2 pip==20.3 flake8==3.9.2 pydocstyle==5.1.1 -virtualenv==20.8.1 +virtualenv==20.10.0 coverage==5.5 gitchangelog==3.0.4 bumpversion==0.6.0 From 1a7d378b0875e868d3b490a206a5cfaf36ff7bc0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Nov 2021 18:40:36 +0000 Subject: [PATCH 08/12] Bump coverage from 5.5 to 6.1.2 Bumps [coverage](https://github.com/nedbat/coveragepy) from 5.5 to 6.1.2. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/coverage-5.5...6.1.2) --- updated-dependencies: - dependency-name: coverage dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 1c109695..302fdc0e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ pip==20.3 flake8==3.9.2 pydocstyle==5.1.1 virtualenv==20.10.0 -coverage==5.5 +coverage==6.1.2 gitchangelog==3.0.4 bumpversion==0.6.0 mako==1.1.5 From 10f0c9d6ebb663a540ae683527c11c8880e2139f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Nov 2021 18:40:46 +0000 Subject: [PATCH 09/12] Bump flake8 from 3.9.2 to 4.0.1 Bumps [flake8](https://github.com/pycqa/flake8) from 3.9.2 to 4.0.1. - [Release notes](https://github.com/pycqa/flake8/releases) - [Commits](https://github.com/pycqa/flake8/compare/3.9.2...4.0.1) --- updated-dependencies: - dependency-name: flake8 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 1c109695..737e4147 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,6 +1,6 @@ setuptools==50.3.2 pip==20.3 -flake8==3.9.2 +flake8==4.0.1 pydocstyle==5.1.1 virtualenv==20.10.0 coverage==5.5 From f62e128ca8a97bbca04673fe61bea77c1800807f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Alejandro=20Mart=C3=ADnez=20Faneyth?= Date: Sun, 14 Nov 2021 00:11:53 -0400 Subject: [PATCH 10/12] [REF] Adding support for Node 17 and Odoo 15. Removing support for Ruby 2.5. --- .github/workflows/push-develop.yml | 3 ++- .github/workflows/push-master.yml | 3 ++- .github/workflows/schedule-master.yml | 3 ++- README.md | 3 ++- {ruby/2.5 => node/17}/Dockerfile | 12 +++++----- node/README.md | 1 + odoo/15.0/Dockerfile | 34 +++++++++++++++++++++++++++ odoo/README.md | 1 + python/2.7/Dockerfile | 2 +- python/3.10/Dockerfile | 2 +- python/3.5/Dockerfile | 2 +- python/3.6/Dockerfile | 2 +- python/3.8/Dockerfile | 2 +- python/3.9/Dockerfile | 2 +- python/Dockerfile.template | 2 +- python/build-image.sh | 12 ++++++---- python/test-image.rb | 2 ++ requirements.txt | 4 ++-- ruby/README.md | 1 - ruby/build-image.sh | 28 ++++------------------ scripts/utils.py | 5 ++-- 21 files changed, 75 insertions(+), 51 deletions(-) rename {ruby/2.5 => node/17}/Dockerfile (64%) create mode 100644 odoo/15.0/Dockerfile diff --git a/.github/workflows/push-develop.yml b/.github/workflows/push-develop.yml index e7a5a69f..8e863e18 100644 --- a/.github/workflows/push-develop.yml +++ b/.github/workflows/push-develop.yml @@ -37,7 +37,6 @@ jobs: docker-image-extra-tags: "dockershelf/python:latest" - docker-image-name: "dockershelf/ruby:2.1" - docker-image-name: "dockershelf/ruby:2.3" - - docker-image-name: "dockershelf/ruby:2.5" - docker-image-name: "dockershelf/ruby:2.7" - docker-image-name: "dockershelf/ruby:3.0" docker-image-extra-tags: "dockershelf/ruby:latest" @@ -46,6 +45,7 @@ jobs: - docker-image-name: "dockershelf/node:14" - docker-image-name: "dockershelf/node:15" - docker-image-name: "dockershelf/node:16" + - docker-image-name: "dockershelf/node:17" docker-image-extra-tags: "dockershelf/node:latest" - docker-image-name: "dockershelf/mongo:4.2" - docker-image-name: "dockershelf/mongo:4.4" @@ -62,6 +62,7 @@ jobs: - docker-image-name: "dockershelf/odoo:12.0" - docker-image-name: "dockershelf/odoo:13.0" - docker-image-name: "dockershelf/odoo:14.0" + - docker-image-name: "dockershelf/odoo:15.0" docker-image-extra-tags: "dockershelf/odoo:latest" - docker-image-name: "dockershelf/php:7.0" - docker-image-name: "dockershelf/php:7.2" diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml index 77860f5b..3a51622c 100644 --- a/.github/workflows/push-master.yml +++ b/.github/workflows/push-master.yml @@ -37,7 +37,6 @@ jobs: docker-image-extra-tags: "dockershelf/python:latest" - docker-image-name: "dockershelf/ruby:2.1" - docker-image-name: "dockershelf/ruby:2.3" - - docker-image-name: "dockershelf/ruby:2.5" - docker-image-name: "dockershelf/ruby:2.7" - docker-image-name: "dockershelf/ruby:3.0" docker-image-extra-tags: "dockershelf/ruby:latest" @@ -46,6 +45,7 @@ jobs: - docker-image-name: "dockershelf/node:14" - docker-image-name: "dockershelf/node:15" - docker-image-name: "dockershelf/node:16" + - docker-image-name: "dockershelf/node:17" docker-image-extra-tags: "dockershelf/node:latest" - docker-image-name: "dockershelf/mongo:4.2" - docker-image-name: "dockershelf/mongo:4.4" @@ -62,6 +62,7 @@ jobs: - docker-image-name: "dockershelf/odoo:12.0" - docker-image-name: "dockershelf/odoo:13.0" - docker-image-name: "dockershelf/odoo:14.0" + - docker-image-name: "dockershelf/odoo:15.0" docker-image-extra-tags: "dockershelf/odoo:latest" - docker-image-name: "dockershelf/php:7.0" - docker-image-name: "dockershelf/php:7.2" diff --git a/.github/workflows/schedule-master.yml b/.github/workflows/schedule-master.yml index bff205c9..87295c52 100644 --- a/.github/workflows/schedule-master.yml +++ b/.github/workflows/schedule-master.yml @@ -36,7 +36,6 @@ jobs: docker-image-extra-tags: "dockershelf/python:latest" - docker-image-name: "dockershelf/ruby:2.1" - docker-image-name: "dockershelf/ruby:2.3" - - docker-image-name: "dockershelf/ruby:2.5" - docker-image-name: "dockershelf/ruby:2.7" - docker-image-name: "dockershelf/ruby:3.0" docker-image-extra-tags: "dockershelf/ruby:latest" @@ -45,6 +44,7 @@ jobs: - docker-image-name: "dockershelf/node:14" - docker-image-name: "dockershelf/node:15" - docker-image-name: "dockershelf/node:16" + - docker-image-name: "dockershelf/node:17" docker-image-extra-tags: "dockershelf/node:latest" - docker-image-name: "dockershelf/mongo:4.2" - docker-image-name: "dockershelf/mongo:4.4" @@ -61,6 +61,7 @@ jobs: - docker-image-name: "dockershelf/odoo:12.0" - docker-image-name: "dockershelf/odoo:13.0" - docker-image-name: "dockershelf/odoo:14.0" + - docker-image-name: "dockershelf/odoo:15.0" docker-image-extra-tags: "dockershelf/odoo:latest" - docker-image-name: "dockershelf/php:7.0" - docker-image-name: "dockershelf/php:7.2" diff --git a/README.md b/README.md index 171e1d6a..2f5ff42b 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,6 @@ These are ruby images with native debian packages that are extracted from differ |-------|---------|------------|--------|------| |[`dockershelf/ruby:2.1`](https://hub.docker.com/r/dockershelf/ruby)|`2.1`|[![](https://img.shields.io/badge/-ruby%2F2.1%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/ruby/2.1/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/ruby?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)|[![](https://img.shields.io/docker/image-size/dockershelf/ruby/2.1.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)| |[`dockershelf/ruby:2.3`](https://hub.docker.com/r/dockershelf/ruby)|`2.3`|[![](https://img.shields.io/badge/-ruby%2F2.3%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/ruby/2.3/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/ruby?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)|[![](https://img.shields.io/docker/image-size/dockershelf/ruby/2.3.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)| -|[`dockershelf/ruby:2.5`](https://hub.docker.com/r/dockershelf/ruby)|`2.5`|[![](https://img.shields.io/badge/-ruby%2F2.5%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/ruby/2.5/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/ruby?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)|[![](https://img.shields.io/docker/image-size/dockershelf/ruby/2.5.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)| |[`dockershelf/ruby:2.7`](https://hub.docker.com/r/dockershelf/ruby)|`2.7`|[![](https://img.shields.io/badge/-ruby%2F2.7%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/ruby/2.7/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/ruby?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)|[![](https://img.shields.io/docker/image-size/dockershelf/ruby/2.7.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)| |[`dockershelf/ruby:3.0`](https://hub.docker.com/r/dockershelf/ruby)|`3.0`|[![](https://img.shields.io/badge/-ruby%2F3.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/ruby/3.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/ruby?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)|[![](https://img.shields.io/docker/image-size/dockershelf/ruby/3.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)| @@ -65,6 +64,7 @@ These are Node images built using the [nodesource installation script](https://n |[`dockershelf/node:14`](https://hub.docker.com/r/dockershelf/node)|`14`|[![](https://img.shields.io/badge/-node%2F14%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/node/14/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/node?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/node)|[![](https://img.shields.io/docker/image-size/dockershelf/node/14.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/node)| |[`dockershelf/node:15`](https://hub.docker.com/r/dockershelf/node)|`15`|[![](https://img.shields.io/badge/-node%2F15%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/node/15/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/node?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/node)|[![](https://img.shields.io/docker/image-size/dockershelf/node/15.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/node)| |[`dockershelf/node:16`](https://hub.docker.com/r/dockershelf/node)|`16`|[![](https://img.shields.io/badge/-node%2F16%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/node/16/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/node?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/node)|[![](https://img.shields.io/docker/image-size/dockershelf/node/16.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/node)| +|[`dockershelf/node:17`](https://hub.docker.com/r/dockershelf/node)|`17`|[![](https://img.shields.io/badge/-node%2F17%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/node/17/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/node?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/node)|[![](https://img.shields.io/docker/image-size/dockershelf/node/17.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/node)| ![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/table.svg) @@ -116,6 +116,7 @@ These images are similar to the official ones, but with some improved configurat |[`dockershelf/odoo:12.0`](https://hub.docker.com/r/dockershelf/odoo)|`12.0`|[![](https://img.shields.io/badge/-odoo%2F12.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/odoo/12.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/odoo?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)|[![](https://img.shields.io/docker/image-size/dockershelf/odoo/12.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)| |[`dockershelf/odoo:13.0`](https://hub.docker.com/r/dockershelf/odoo)|`13.0`|[![](https://img.shields.io/badge/-odoo%2F13.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/odoo/13.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/odoo?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)|[![](https://img.shields.io/docker/image-size/dockershelf/odoo/13.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)| |[`dockershelf/odoo:14.0`](https://hub.docker.com/r/dockershelf/odoo)|`14.0`|[![](https://img.shields.io/badge/-odoo%2F14.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/odoo/14.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/odoo?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)|[![](https://img.shields.io/docker/image-size/dockershelf/odoo/14.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)| +|[`dockershelf/odoo:15.0`](https://hub.docker.com/r/dockershelf/odoo)|`15.0`|[![](https://img.shields.io/badge/-odoo%2F15.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/odoo/15.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/odoo?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)|[![](https://img.shields.io/docker/image-size/dockershelf/odoo/15.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)| ![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/table.svg) diff --git a/ruby/2.5/Dockerfile b/node/17/Dockerfile similarity index 64% rename from ruby/2.5/Dockerfile rename to node/17/Dockerfile index 9e5cafd7..acd1e514 100644 --- a/ruby/2.5/Dockerfile +++ b/node/17/Dockerfile @@ -5,8 +5,8 @@ ARG VCS_REF ARG VERSION LABEL org.label-schema.build-date=${BUILD_DATE} \ - org.label-schema.name="ruby2.5" \ - org.label-schema.description="A Ruby 2.5 image based on Debian sid." \ + org.label-schema.name="node17" \ + org.label-schema.description="A Node 17 image based on Debian sid." \ org.label-schema.url="https://github.com/Dockershelf/dockershelf" \ org.label-schema.vcs-ref=${VCS_REF} \ org.label-schema.vcs-url="https://github.com/Dockershelf/dockershelf" \ @@ -15,9 +15,9 @@ LABEL org.label-schema.build-date=${BUILD_DATE} \ org.label-schema.schema-version="1.0.0-rc.1" \ maintainer="Luis Alejandro Martínez Faneyth " -ENV RUBY_VER_NUM="2.5" RUBY_DEBIAN_SUITE="buster-security" +ENV NODE_VER_NUM="17" -COPY build-image.sh library.sh /usr/share/dockershelf/ruby/ -RUN bash /usr/share/dockershelf/ruby/build-image.sh +COPY build-image.sh library.sh /usr/share/dockershelf/node/ +RUN bash /usr/share/dockershelf/node/build-image.sh -CMD ["ruby"] \ No newline at end of file +CMD ["/bin/bash"] \ No newline at end of file diff --git a/node/README.md b/node/README.md index 0846a228..6d004689 100644 --- a/node/README.md +++ b/node/README.md @@ -13,6 +13,7 @@ |[`dockershelf/node:14`](https://hub.docker.com/r/dockershelf/node)|`14`|[![](https://img.shields.io/badge/-node%2F14%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/node/14/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/node?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/node)|[![](https://img.shields.io/docker/image-size/dockershelf/node/14.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/node)| |[`dockershelf/node:15`](https://hub.docker.com/r/dockershelf/node)|`15`|[![](https://img.shields.io/badge/-node%2F15%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/node/15/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/node?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/node)|[![](https://img.shields.io/docker/image-size/dockershelf/node/15.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/node)| |[`dockershelf/node:16`](https://hub.docker.com/r/dockershelf/node)|`16`|[![](https://img.shields.io/badge/-node%2F16%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/node/16/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/node?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/node)|[![](https://img.shields.io/docker/image-size/dockershelf/node/16.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/node)| +|[`dockershelf/node:17`](https://hub.docker.com/r/dockershelf/node)|`17`|[![](https://img.shields.io/badge/-node%2F17%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/node/17/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/node?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/node)|[![](https://img.shields.io/docker/image-size/dockershelf/node/17.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/node)| ![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/table.svg) diff --git a/odoo/15.0/Dockerfile b/odoo/15.0/Dockerfile new file mode 100644 index 00000000..1332f951 --- /dev/null +++ b/odoo/15.0/Dockerfile @@ -0,0 +1,34 @@ +FROM dockershelf/python:3.10 + +ARG BUILD_DATE +ARG VCS_REF +ARG VERSION + +LABEL org.label-schema.build-date=${BUILD_DATE} \ + org.label-schema.name="odoo15.0" \ + org.label-schema.description="An Odoo 15.0 image based on Debian sid, Python 3.10 and Node 14." \ + org.label-schema.url="https://github.com/Dockershelf/dockershelf" \ + org.label-schema.vcs-ref=${VCS_REF} \ + org.label-schema.vcs-url="https://github.com/Dockershelf/dockershelf" \ + org.label-schema.vendor="Luis Alejandro Martínez Faneyth" \ + org.label-schema.version=${VERSION} \ + org.label-schema.schema-version="1.0.0-rc.1" \ + maintainer="Luis Alejandro Martínez Faneyth " + +ENV ODOO_VER_NUM="15.0" NODE_VER_NUM="14" + +COPY odoo.conf /etc/odoo/ +COPY docker-entrypoint.sh /usr/local/bin/ +COPY build-image-node.sh /usr/share/dockershelf/node/build-image.sh +COPY library.sh /usr/share/dockershelf/node/ +COPY build-image.sh library.sh /usr/share/dockershelf/odoo/ + +RUN bash /usr/share/dockershelf/node/build-image.sh +RUN bash /usr/share/dockershelf/odoo/build-image.sh + +VOLUME /var/lib/odoo /mnt/extra-addons + +EXPOSE 8069 8071 + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["odoo"] \ No newline at end of file diff --git a/odoo/README.md b/odoo/README.md index 1fd3d662..f38cae8d 100644 --- a/odoo/README.md +++ b/odoo/README.md @@ -12,6 +12,7 @@ |[`dockershelf/odoo:12.0`](https://hub.docker.com/r/dockershelf/odoo)|`12.0`|[![](https://img.shields.io/badge/-odoo%2F12.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/odoo/12.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/odoo?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)|[![](https://img.shields.io/docker/image-size/dockershelf/odoo/12.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)| |[`dockershelf/odoo:13.0`](https://hub.docker.com/r/dockershelf/odoo)|`13.0`|[![](https://img.shields.io/badge/-odoo%2F13.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/odoo/13.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/odoo?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)|[![](https://img.shields.io/docker/image-size/dockershelf/odoo/13.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)| |[`dockershelf/odoo:14.0`](https://hub.docker.com/r/dockershelf/odoo)|`14.0`|[![](https://img.shields.io/badge/-odoo%2F14.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/odoo/14.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/odoo?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)|[![](https://img.shields.io/docker/image-size/dockershelf/odoo/14.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)| +|[`dockershelf/odoo:15.0`](https://hub.docker.com/r/dockershelf/odoo)|`15.0`|[![](https://img.shields.io/badge/-odoo%2F15.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/odoo/15.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/odoo?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)|[![](https://img.shields.io/docker/image-size/dockershelf/odoo/15.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)| ![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/table.svg) diff --git a/python/2.7/Dockerfile b/python/2.7/Dockerfile index 1d63e003..b34f1b81 100644 --- a/python/2.7/Dockerfile +++ b/python/2.7/Dockerfile @@ -16,7 +16,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE} \ maintainer="Luis Alejandro Martínez Faneyth " ENV PYTHON_VER_NUM="2.7" PYTHON_DEBIAN_SUITE="sid" \ - PYTHONIOENCODING="UTF-8" PYTHONPATH="/usr/lib/python2.7/dist-packages" + PYTHONIOENCODING="UTF-8" PYTHONPATH="/usr/lib/python2.7/dist-packages:/usr/lib/python2.7/site-packages" COPY build-image.sh library.sh /usr/share/dockershelf/python/ RUN bash /usr/share/dockershelf/python/build-image.sh diff --git a/python/3.10/Dockerfile b/python/3.10/Dockerfile index 4e63d1b4..4c317bc9 100644 --- a/python/3.10/Dockerfile +++ b/python/3.10/Dockerfile @@ -16,7 +16,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE} \ maintainer="Luis Alejandro Martínez Faneyth " ENV PYTHON_VER_NUM="3.10" PYTHON_DEBIAN_SUITE="sid" \ - PYTHONIOENCODING="UTF-8" PYTHONPATH="/usr/lib/python3.10/dist-packages" + PYTHONIOENCODING="UTF-8" PYTHONPATH="/usr/lib/python3.10/dist-packages:/usr/lib/python3.10/site-packages" COPY build-image.sh library.sh /usr/share/dockershelf/python/ RUN bash /usr/share/dockershelf/python/build-image.sh diff --git a/python/3.5/Dockerfile b/python/3.5/Dockerfile index facb68d7..75d7453d 100644 --- a/python/3.5/Dockerfile +++ b/python/3.5/Dockerfile @@ -16,7 +16,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE} \ maintainer="Luis Alejandro Martínez Faneyth " ENV PYTHON_VER_NUM="3.5" PYTHON_DEBIAN_SUITE="stretch" \ - PYTHONIOENCODING="UTF-8" PYTHONPATH="/usr/lib/python3.5/dist-packages" + PYTHONIOENCODING="UTF-8" PYTHONPATH="/usr/lib/python3.5/dist-packages:/usr/lib/python3.5/site-packages" COPY build-image.sh library.sh /usr/share/dockershelf/python/ RUN bash /usr/share/dockershelf/python/build-image.sh diff --git a/python/3.6/Dockerfile b/python/3.6/Dockerfile index b3ef47d7..d3b91006 100644 --- a/python/3.6/Dockerfile +++ b/python/3.6/Dockerfile @@ -16,7 +16,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE} \ maintainer="Luis Alejandro Martínez Faneyth " ENV PYTHON_VER_NUM="3.6" PYTHON_DEBIAN_SUITE="sid" \ - PYTHONIOENCODING="UTF-8" PYTHONPATH="/usr/lib/python3.6/dist-packages" + PYTHONIOENCODING="UTF-8" PYTHONPATH="/usr/lib/python3.6/dist-packages:/usr/lib/python3.6/site-packages" COPY build-image.sh library.sh /usr/share/dockershelf/python/ RUN bash /usr/share/dockershelf/python/build-image.sh diff --git a/python/3.8/Dockerfile b/python/3.8/Dockerfile index 2f9cf265..4329e951 100644 --- a/python/3.8/Dockerfile +++ b/python/3.8/Dockerfile @@ -16,7 +16,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE} \ maintainer="Luis Alejandro Martínez Faneyth " ENV PYTHON_VER_NUM="3.8" PYTHON_DEBIAN_SUITE="sid" \ - PYTHONIOENCODING="UTF-8" PYTHONPATH="/usr/lib/python3.8/dist-packages" + PYTHONIOENCODING="UTF-8" PYTHONPATH="/usr/lib/python3.8/dist-packages:/usr/lib/python3.8/site-packages" COPY build-image.sh library.sh /usr/share/dockershelf/python/ RUN bash /usr/share/dockershelf/python/build-image.sh diff --git a/python/3.9/Dockerfile b/python/3.9/Dockerfile index 921776dc..054808da 100644 --- a/python/3.9/Dockerfile +++ b/python/3.9/Dockerfile @@ -16,7 +16,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE} \ maintainer="Luis Alejandro Martínez Faneyth " ENV PYTHON_VER_NUM="3.9" PYTHON_DEBIAN_SUITE="bookworm" \ - PYTHONIOENCODING="UTF-8" PYTHONPATH="/usr/lib/python3.9/dist-packages" + PYTHONIOENCODING="UTF-8" PYTHONPATH="/usr/lib/python3.9/dist-packages:/usr/lib/python3.9/site-packages" COPY build-image.sh library.sh /usr/share/dockershelf/python/ RUN bash /usr/share/dockershelf/python/build-image.sh diff --git a/python/Dockerfile.template b/python/Dockerfile.template index 2ed8f343..f594e6b5 100644 --- a/python/Dockerfile.template +++ b/python/Dockerfile.template @@ -16,7 +16,7 @@ LABEL org.label-schema.build-date=${BUILD_DATE} \ maintainer="Luis Alejandro Martínez Faneyth " ENV PYTHON_VER_NUM="%%PYTHON_VERSION%%" PYTHON_DEBIAN_SUITE="%%PYTHON_DEBIAN_SUITE%%" \ - PYTHONIOENCODING="UTF-8" PYTHONPATH="/usr/lib/python%%PYTHON_VERSION%%/dist-packages" + PYTHONIOENCODING="UTF-8" PYTHONPATH="/usr/lib/python%%PYTHON_VERSION%%/dist-packages:/usr/lib/python%%PYTHON_VERSION%%/site-packages" COPY build-image.sh library.sh /usr/share/dockershelf/python/ RUN bash /usr/share/dockershelf/python/build-image.sh diff --git a/python/build-image.sh b/python/build-image.sh index 5baa615d..3bc48239 100755 --- a/python/build-image.sh +++ b/python/build-image.sh @@ -42,7 +42,7 @@ PYTHON_PKGS="lib${PYTHON_VER_NUM_MINOR_STR}-minimal \ lib${PYTHON_VER_NUM_MINOR_STR}-dev ${PYTHON_VER_NUM_MINOR_STR}-dev" # Some tools are needed. -DPKG_TOOLS_DEPENDS="aptitude deborphan debian-keyring dpkg-dev gnupg" +DPKG_TOOLS_DEPENDS="aptitude deborphan debian-keyring dpkg-dev gnupg git" # Load helper functions source "${BASEDIR}/library.sh" @@ -103,7 +103,7 @@ DPKG_DEPENDS="$( printf '%s\n' ${DPKG_RUN_DEPENDS} | uniq | xargs )" if [ "${PYTHON_VER_NUM}" == "3.8" ]; then DPKG_DEPENDS="$( echo ${DPKG_DEPENDS} | sed 's/libc6-dev//g' | \ - sed 's/libc6//g' | sed 's/libc-dev-bin//g' )" + sed 's/libc6//g' | sed 's/libc-dev-bin//g' | sed 's/libffi8ubuntu1//g' )" fi cmdretry apt-get install -d ${DPKG_DEPENDS} @@ -136,8 +136,8 @@ elif [ "${PYTHON_VER_NUM}" == "3.9" ]; then cmdretry apt-get install -d ${PYTHON_VER_NUM_MAJOR_STR}-distutils -t bookworm cmdretry apt-get install ${PYTHON_VER_NUM_MAJOR_STR}-distutils -t bookworm elif [ "${PYTHON_VER_NUM}" == "3.10" ]; then - cmdretry apt-get install -d ${PYTHON_VER_NUM_MAJOR_STR}-distutils - cmdretry apt-get install ${PYTHON_VER_NUM_MAJOR_STR}-distutils + git clone https://github.com/pypa/distutils + cp -r distutils/distutils/* /usr/lib/python3.10/distutils/ fi # Pip: Installation @@ -157,6 +157,10 @@ else ${PYTHON_VER_NUM_MINOR_STR} - 'setuptools' fi +if [ ! -f "/usr/bin/pip" ]; then + ln -s /usr/bin/pip${PYTHON_VER_NUM} /usr/bin/pip +fi + # Apt: Remove unnecessary packages # ------------------------------------------------------------------------------ # We need to clear the filesystem of unwanted packages to shrink image size. diff --git a/python/test-image.rb b/python/test-image.rb index a71e770d..6f4b543a 100644 --- a/python/test-image.rb +++ b/python/test-image.rb @@ -42,6 +42,8 @@ def python_version_long end it "should be able to install a python package" do + puts command("pip install virtualenv").stdout.strip + puts command("pip install virtualenv").stderr.strip expect(command("pip install virtualenv").exit_status).to eq(0) case python_version() when "3.10" diff --git a/requirements.txt b/requirements.txt index 82c4937c..1f11c91a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -packaging==21.0 -lxml==4.6.3 +packaging==21.2 +lxml==4.6.4 cssselect==1.1.0 diff --git a/ruby/README.md b/ruby/README.md index ea17e3b6..4b798e75 100644 --- a/ruby/README.md +++ b/ruby/README.md @@ -10,7 +10,6 @@ |-------|---------|------------|--------|------| |[`dockershelf/ruby:2.1`](https://hub.docker.com/r/dockershelf/ruby)|`2.1`|[![](https://img.shields.io/badge/-ruby%2F2.1%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/ruby/2.1/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/ruby?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)|[![](https://img.shields.io/docker/image-size/dockershelf/ruby/2.1.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)| |[`dockershelf/ruby:2.3`](https://hub.docker.com/r/dockershelf/ruby)|`2.3`|[![](https://img.shields.io/badge/-ruby%2F2.3%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/ruby/2.3/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/ruby?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)|[![](https://img.shields.io/docker/image-size/dockershelf/ruby/2.3.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)| -|[`dockershelf/ruby:2.5`](https://hub.docker.com/r/dockershelf/ruby)|`2.5`|[![](https://img.shields.io/badge/-ruby%2F2.5%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/ruby/2.5/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/ruby?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)|[![](https://img.shields.io/docker/image-size/dockershelf/ruby/2.5.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)| |[`dockershelf/ruby:2.7`](https://hub.docker.com/r/dockershelf/ruby)|`2.7`|[![](https://img.shields.io/badge/-ruby%2F2.7%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/ruby/2.7/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/ruby?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)|[![](https://img.shields.io/docker/image-size/dockershelf/ruby/2.7.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)| |[`dockershelf/ruby:3.0`](https://hub.docker.com/r/dockershelf/ruby)|`3.0`|[![](https://img.shields.io/badge/-ruby%2F3.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/ruby/3.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/ruby?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)|[![](https://img.shields.io/docker/image-size/dockershelf/ruby/3.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/ruby)| diff --git a/ruby/build-image.sh b/ruby/build-image.sh index c071b713..d2dfbd45 100755 --- a/ruby/build-image.sh +++ b/ruby/build-image.sh @@ -32,8 +32,6 @@ RUBY_VER_NUM_MAJOR_STR="ruby${RUBY_VER_NUM_MAJOR}" MIRROR="http://deb.debian.org/debian" SECMIRROR="http://deb.debian.org/debian-security" -ARMIRROR="http://archive.debian.org/debian" -ARSECMIRROR="http://archive.debian.org/debian-security" # This is the list of ruby packages from debian that make up a minimal # ruby installation. We will use them later. @@ -72,11 +70,6 @@ if [ "${RUBY_DEBIAN_SUITE}" == "jessie-security" ]; then echo "deb ${MIRROR} jessie main" echo "deb ${SECMIRROR} jessie/updates main" } | tee /etc/apt/sources.list.d/ruby.list > /dev/null -elif [ "${RUBY_DEBIAN_SUITE}" == "buster-security" ]; then - { - echo "deb ${MIRROR} buster main" - echo "deb ${SECMIRROR} buster/updates main" - } | tee /etc/apt/sources.list.d/ruby.list > /dev/null elif [ "${RUBY_DEBIAN_SUITE}" != "sid" ]; then { echo "deb ${MIRROR} ${RUBY_DEBIAN_SUITE} main" @@ -95,29 +88,16 @@ DPKG_RUN_DEPENDS="$( aptitude search -F%p \ sed "$( printf 's/\s%s\s/ /g;' ${RUBY_PKGS} )" )" DPKG_DEPENDS="$( printf '%s\n' ${DPKG_RUN_DEPENDS} | uniq | xargs )" -if [ "${RUBY_DEBIAN_SUITE}" == "buster-security" ]; then - cmdretry apt-get install -d libncurses6 libncursesw6 libtinfo6 - cmdretry apt-get install libncurses6 libncursesw6 libtinfo6 - cmdretry apt-get -t buster --allow-downgrades install libgmp10/buster - cmdretry apt-get install -d ${DPKG_DEPENDS} -t buster - cmdretry apt-get install ${DPKG_DEPENDS} -t buster -else - cmdretry apt-get install -d ${DPKG_DEPENDS} - cmdretry apt-get install ${DPKG_DEPENDS} -fi +cmdretry apt-get install -d ${DPKG_DEPENDS} +cmdretry apt-get install ${DPKG_DEPENDS} # Ruby: Installation # ------------------------------------------------------------------------------ # We will install the packages listed in ${RUBY_PKGS} msginfo "Installing Ruby ..." -if [ "${RUBY_DEBIAN_SUITE}" == "buster-security" ]; then - cmdretry apt-get install -d ${RUBY_PKGS} -t buster - cmdretry apt-get install ${RUBY_PKGS} -t buster -else - cmdretry apt-get install -d ${RUBY_PKGS} - cmdretry apt-get install ${RUBY_PKGS} -fi +cmdretry apt-get install -d ${RUBY_PKGS} +cmdretry apt-get install ${RUBY_PKGS} # Apt: Remove unnecessary packages # ------------------------------------------------------------------------------ diff --git a/scripts/utils.py b/scripts/utils.py index cd36e30a..8e0efc74 100644 --- a/scripts/utils.py +++ b/scripts/utils.py @@ -50,12 +50,12 @@ node_versions_list_file = 'https://raw.githubusercontent.com/nodesource/distributions/master/deb/src/build.sh' node_version_lower_limit = 10 -node_version_upper_limit = 16 +node_version_upper_limit = 17 node_versions_disabled = ['11', '13'] odoo_versions_list_file = 'http://nightly.odoo.com/index.html' odoo_version_lower_limit = 11.0 -odoo_version_upper_limit = 14.0 +odoo_version_upper_limit = 15.0 postgres_release_url = 'http://apt.postgresql.org/pub/repos/apt/dists/sid-pgdg/Release' postgres_version_lower_limit = 9.6 @@ -81,7 +81,6 @@ ruby_versions_src_origin = { '2.1': 'jessie-security', '2.3': 'stretch', - '2.5': 'buster-security', '2.7': 'sid', '3.0': 'experimental', } From d01716458c7d486e58adb81b5eb30f0bf9d2e710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Alejandro=20Mart=C3=ADnez=20Faneyth?= Date: Sun, 14 Nov 2021 01:27:20 -0400 Subject: [PATCH 11/12] [REF] Removing support for Odoo 15. --- .github/workflows/push-develop.yml | 1 - .github/workflows/push-master.yml | 1 - .github/workflows/schedule-master.yml | 1 - README.md | 1 - odoo/11.0/Dockerfile | 4 ++-- odoo/12.0/Dockerfile | 4 ++-- odoo/13.0/Dockerfile | 4 ++-- odoo/14.0/Dockerfile | 4 ++-- odoo/15.0/Dockerfile | 34 --------------------------- odoo/README.md | 1 - odoo/build-image.sh | 5 ++-- scripts/update_odoo.py | 2 +- scripts/utils.py | 2 +- 13 files changed, 13 insertions(+), 51 deletions(-) delete mode 100644 odoo/15.0/Dockerfile diff --git a/.github/workflows/push-develop.yml b/.github/workflows/push-develop.yml index 8e863e18..36b36ee5 100644 --- a/.github/workflows/push-develop.yml +++ b/.github/workflows/push-develop.yml @@ -62,7 +62,6 @@ jobs: - docker-image-name: "dockershelf/odoo:12.0" - docker-image-name: "dockershelf/odoo:13.0" - docker-image-name: "dockershelf/odoo:14.0" - - docker-image-name: "dockershelf/odoo:15.0" docker-image-extra-tags: "dockershelf/odoo:latest" - docker-image-name: "dockershelf/php:7.0" - docker-image-name: "dockershelf/php:7.2" diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml index 3a51622c..e98a9720 100644 --- a/.github/workflows/push-master.yml +++ b/.github/workflows/push-master.yml @@ -62,7 +62,6 @@ jobs: - docker-image-name: "dockershelf/odoo:12.0" - docker-image-name: "dockershelf/odoo:13.0" - docker-image-name: "dockershelf/odoo:14.0" - - docker-image-name: "dockershelf/odoo:15.0" docker-image-extra-tags: "dockershelf/odoo:latest" - docker-image-name: "dockershelf/php:7.0" - docker-image-name: "dockershelf/php:7.2" diff --git a/.github/workflows/schedule-master.yml b/.github/workflows/schedule-master.yml index 87295c52..fed85b8a 100644 --- a/.github/workflows/schedule-master.yml +++ b/.github/workflows/schedule-master.yml @@ -61,7 +61,6 @@ jobs: - docker-image-name: "dockershelf/odoo:12.0" - docker-image-name: "dockershelf/odoo:13.0" - docker-image-name: "dockershelf/odoo:14.0" - - docker-image-name: "dockershelf/odoo:15.0" docker-image-extra-tags: "dockershelf/odoo:latest" - docker-image-name: "dockershelf/php:7.0" - docker-image-name: "dockershelf/php:7.2" diff --git a/README.md b/README.md index 2f5ff42b..c97b5ce7 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,6 @@ These images are similar to the official ones, but with some improved configurat |[`dockershelf/odoo:12.0`](https://hub.docker.com/r/dockershelf/odoo)|`12.0`|[![](https://img.shields.io/badge/-odoo%2F12.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/odoo/12.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/odoo?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)|[![](https://img.shields.io/docker/image-size/dockershelf/odoo/12.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)| |[`dockershelf/odoo:13.0`](https://hub.docker.com/r/dockershelf/odoo)|`13.0`|[![](https://img.shields.io/badge/-odoo%2F13.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/odoo/13.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/odoo?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)|[![](https://img.shields.io/docker/image-size/dockershelf/odoo/13.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)| |[`dockershelf/odoo:14.0`](https://hub.docker.com/r/dockershelf/odoo)|`14.0`|[![](https://img.shields.io/badge/-odoo%2F14.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/odoo/14.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/odoo?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)|[![](https://img.shields.io/docker/image-size/dockershelf/odoo/14.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)| -|[`dockershelf/odoo:15.0`](https://hub.docker.com/r/dockershelf/odoo)|`15.0`|[![](https://img.shields.io/badge/-odoo%2F15.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/odoo/15.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/odoo?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)|[![](https://img.shields.io/docker/image-size/dockershelf/odoo/15.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)| ![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/table.svg) diff --git a/odoo/11.0/Dockerfile b/odoo/11.0/Dockerfile index fa0e6d2c..6f4c75a7 100644 --- a/odoo/11.0/Dockerfile +++ b/odoo/11.0/Dockerfile @@ -1,4 +1,4 @@ -FROM dockershelf/python:3.10 +FROM dockershelf/python:3.9 ARG BUILD_DATE ARG VCS_REF @@ -6,7 +6,7 @@ ARG VERSION LABEL org.label-schema.build-date=${BUILD_DATE} \ org.label-schema.name="odoo11.0" \ - org.label-schema.description="An Odoo 11.0 image based on Debian sid, Python 3.10 and Node 14." \ + org.label-schema.description="An Odoo 11.0 image based on Debian sid, Python 3.9 and Node 14." \ org.label-schema.url="https://github.com/Dockershelf/dockershelf" \ org.label-schema.vcs-ref=${VCS_REF} \ org.label-schema.vcs-url="https://github.com/Dockershelf/dockershelf" \ diff --git a/odoo/12.0/Dockerfile b/odoo/12.0/Dockerfile index eab7b09a..72768936 100644 --- a/odoo/12.0/Dockerfile +++ b/odoo/12.0/Dockerfile @@ -1,4 +1,4 @@ -FROM dockershelf/python:3.10 +FROM dockershelf/python:3.9 ARG BUILD_DATE ARG VCS_REF @@ -6,7 +6,7 @@ ARG VERSION LABEL org.label-schema.build-date=${BUILD_DATE} \ org.label-schema.name="odoo12.0" \ - org.label-schema.description="An Odoo 12.0 image based on Debian sid, Python 3.10 and Node 14." \ + org.label-schema.description="An Odoo 12.0 image based on Debian sid, Python 3.9 and Node 14." \ org.label-schema.url="https://github.com/Dockershelf/dockershelf" \ org.label-schema.vcs-ref=${VCS_REF} \ org.label-schema.vcs-url="https://github.com/Dockershelf/dockershelf" \ diff --git a/odoo/13.0/Dockerfile b/odoo/13.0/Dockerfile index 871163db..7c27bec6 100644 --- a/odoo/13.0/Dockerfile +++ b/odoo/13.0/Dockerfile @@ -1,4 +1,4 @@ -FROM dockershelf/python:3.10 +FROM dockershelf/python:3.9 ARG BUILD_DATE ARG VCS_REF @@ -6,7 +6,7 @@ ARG VERSION LABEL org.label-schema.build-date=${BUILD_DATE} \ org.label-schema.name="odoo13.0" \ - org.label-schema.description="An Odoo 13.0 image based on Debian sid, Python 3.10 and Node 14." \ + org.label-schema.description="An Odoo 13.0 image based on Debian sid, Python 3.9 and Node 14." \ org.label-schema.url="https://github.com/Dockershelf/dockershelf" \ org.label-schema.vcs-ref=${VCS_REF} \ org.label-schema.vcs-url="https://github.com/Dockershelf/dockershelf" \ diff --git a/odoo/14.0/Dockerfile b/odoo/14.0/Dockerfile index accad926..75d5f870 100644 --- a/odoo/14.0/Dockerfile +++ b/odoo/14.0/Dockerfile @@ -1,4 +1,4 @@ -FROM dockershelf/python:3.10 +FROM dockershelf/python:3.9 ARG BUILD_DATE ARG VCS_REF @@ -6,7 +6,7 @@ ARG VERSION LABEL org.label-schema.build-date=${BUILD_DATE} \ org.label-schema.name="odoo14.0" \ - org.label-schema.description="An Odoo 14.0 image based on Debian sid, Python 3.10 and Node 14." \ + org.label-schema.description="An Odoo 14.0 image based on Debian sid, Python 3.9 and Node 14." \ org.label-schema.url="https://github.com/Dockershelf/dockershelf" \ org.label-schema.vcs-ref=${VCS_REF} \ org.label-schema.vcs-url="https://github.com/Dockershelf/dockershelf" \ diff --git a/odoo/15.0/Dockerfile b/odoo/15.0/Dockerfile deleted file mode 100644 index 1332f951..00000000 --- a/odoo/15.0/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -FROM dockershelf/python:3.10 - -ARG BUILD_DATE -ARG VCS_REF -ARG VERSION - -LABEL org.label-schema.build-date=${BUILD_DATE} \ - org.label-schema.name="odoo15.0" \ - org.label-schema.description="An Odoo 15.0 image based on Debian sid, Python 3.10 and Node 14." \ - org.label-schema.url="https://github.com/Dockershelf/dockershelf" \ - org.label-schema.vcs-ref=${VCS_REF} \ - org.label-schema.vcs-url="https://github.com/Dockershelf/dockershelf" \ - org.label-schema.vendor="Luis Alejandro Martínez Faneyth" \ - org.label-schema.version=${VERSION} \ - org.label-schema.schema-version="1.0.0-rc.1" \ - maintainer="Luis Alejandro Martínez Faneyth " - -ENV ODOO_VER_NUM="15.0" NODE_VER_NUM="14" - -COPY odoo.conf /etc/odoo/ -COPY docker-entrypoint.sh /usr/local/bin/ -COPY build-image-node.sh /usr/share/dockershelf/node/build-image.sh -COPY library.sh /usr/share/dockershelf/node/ -COPY build-image.sh library.sh /usr/share/dockershelf/odoo/ - -RUN bash /usr/share/dockershelf/node/build-image.sh -RUN bash /usr/share/dockershelf/odoo/build-image.sh - -VOLUME /var/lib/odoo /mnt/extra-addons - -EXPOSE 8069 8071 - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["odoo"] \ No newline at end of file diff --git a/odoo/README.md b/odoo/README.md index f38cae8d..1fd3d662 100644 --- a/odoo/README.md +++ b/odoo/README.md @@ -12,7 +12,6 @@ |[`dockershelf/odoo:12.0`](https://hub.docker.com/r/dockershelf/odoo)|`12.0`|[![](https://img.shields.io/badge/-odoo%2F12.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/odoo/12.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/odoo?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)|[![](https://img.shields.io/docker/image-size/dockershelf/odoo/12.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)| |[`dockershelf/odoo:13.0`](https://hub.docker.com/r/dockershelf/odoo)|`13.0`|[![](https://img.shields.io/badge/-odoo%2F13.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/odoo/13.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/odoo?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)|[![](https://img.shields.io/docker/image-size/dockershelf/odoo/13.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)| |[`dockershelf/odoo:14.0`](https://hub.docker.com/r/dockershelf/odoo)|`14.0`|[![](https://img.shields.io/badge/-odoo%2F14.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/odoo/14.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/odoo?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)|[![](https://img.shields.io/docker/image-size/dockershelf/odoo/14.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)| -|[`dockershelf/odoo:15.0`](https://hub.docker.com/r/dockershelf/odoo)|`15.0`|[![](https://img.shields.io/badge/-odoo%2F15.0%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/odoo/15.0/Dockerfile)|[![](https://img.shields.io/docker/pulls/dockershelf/odoo?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)|[![](https://img.shields.io/docker/image-size/dockershelf/odoo/15.0.svg?colorA=22313f&colorB=4a637b&cacheSeconds=900)](https://hub.docker.com/r/dockershelf/odoo)| ![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/table.svg) diff --git a/odoo/build-image.sh b/odoo/build-image.sh index 2eae8e7c..96706bc3 100755 --- a/odoo/build-image.sh +++ b/odoo/build-image.sh @@ -23,10 +23,11 @@ set -exuo pipefail # Some default values. BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + DEBMIRROR="http://deb.debian.org/debian" MIRROR="http://nightly.odoo.com/${ODOO_VER_NUM}/nightly/deb/" -WKHTMLTOX_URL="https://github.com/wkhtmltopdf/wkhtmltopdf/"\ -"releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb" +WKHTMLTOX_URL="https://github.com/wkhtmltopdf/packaging/"\ +"releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_amd64.deb" # Some tools are needed. DPKG_TOOLS_DEPENDS="aptitude deborphan debian-keyring dpkg-dev gnupg" diff --git a/scripts/update_odoo.py b/scripts/update_odoo.py index 8f0cf5ff..f98a4f6b 100644 --- a/scripts/update_odoo.py +++ b/scripts/update_odoo.py @@ -78,7 +78,7 @@ def update_odoo(basedir): logger.info('Processing Odoo {0}'.format(odoo_version)) if float(odoo_version) >= 11.0: - python_version = '3.10' + python_version = '3.9' else: python_version = '2.7' diff --git a/scripts/utils.py b/scripts/utils.py index 8e0efc74..da372743 100644 --- a/scripts/utils.py +++ b/scripts/utils.py @@ -55,7 +55,7 @@ odoo_versions_list_file = 'http://nightly.odoo.com/index.html' odoo_version_lower_limit = 11.0 -odoo_version_upper_limit = 15.0 +odoo_version_upper_limit = 14.0 postgres_release_url = 'http://apt.postgresql.org/pub/repos/apt/dists/sid-pgdg/Release' postgres_version_lower_limit = 9.6 From 2b2a0a92eb8c694f95aa27b130b06243527f43f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Alejandro=20Mart=C3=ADnez=20Faneyth?= Date: Sun, 14 Nov 2021 10:23:53 -0400 Subject: [PATCH 12/12] Updating Changelog and version. --- .bumpversion.cfg | 2 +- .gitchangelog.rc | 24 +- HISTORY.md | 705 +++++++++++++++++++++++++++++++++++++++++++++ README.md | 2 +- README.md.template | 2 +- 5 files changed, 726 insertions(+), 9 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ed3c1c55..5fc20734 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.6.1 +current_version = 2.6.2 tag_name = {new_version} commit = True tag = True diff --git a/.gitchangelog.rc b/.gitchangelog.rc index b622f220..c782d813 100644 --- a/.gitchangelog.rc +++ b/.gitchangelog.rc @@ -5,7 +5,7 @@ ## ## Description ## -## ACTION is one of '[REF]', '[FIX]', '[ADD]' +## ACTION is one of '[REF]', '[FIX]', '[ADD]', '[DEL]' ## ## Is WHAT the change is about. ## @@ -41,6 +41,17 @@ ignore_regexps = [ r'^(.{3,3}\s*:)?\s*[Uu]pdating [Cc]hangelog and [Vv]ersion.?\s*$', r'^(.{3,3}\s*:)?\s*[fF]irst commit.?\s*$', + r'@minor', r'!minor', + r'@cosmetic', r'!cosmetic', + r'@refactor', r'!refactor', + r'@wip', r'!wip', + r'^[Cc][Ii]\s*:', ## ignore Ci-related commits + r'^.*:\s*[Cc][Ii]\s*:', ## ignore Ci-related commits + r'^.*[Cc]ircle[Cc][Ii]\s*', ## ignore Ci-related commits + r'^.*:github:.*$', + r'^.*:changelog:.*$', + r'^Git-svn-id', + r'^$', ## ignore commits with empty messages ] @@ -57,9 +68,10 @@ ignore_regexps = [ ## whenever you are tweaking this variable. ## section_regexps = [ - ('New', [r'^\[ADD\]\s*([^\n]*)$']), - ('Changes', [r'^\[REF\]\s*([^\n]*)$']), - ('Fix', [r'^\[FIX\]\s*([^\n]*)$']), + ('Added', [r'^\[ADD\]\s*([^\n]*)$']), + ('Changed', [r'^\[REF\]\s*([^\n]*)$']), + ('Fixed', [r'^\[FIX\]\s*([^\n]*)$']), + ('Removed', [r'^\[DEL\]\s*([^\n]*)$']), ('Other', None), ] @@ -120,7 +132,7 @@ tag_filter_regexp = r'^[0-9]+\.[0-9]+(\.[0-9]+)?$' ## ## This label will be used as the changelog Title of the last set of changes ## between last valid tag and HEAD if any. -unreleased_version_label = "%%version%% (unreleased)" +unreleased_version_label = "(unreleased)" ## ``output_engine`` is a callable @@ -154,7 +166,7 @@ unreleased_version_label = "%%version%% (unreleased)" #output_engine = rest_py #output_engine = mustache("restructuredtext") #output_engine = mustache("markdown") -output_engine = makotemplate("markdown") +output_engine = makotemplate(".gitchangelog.tpl") ## ``include_merge`` is a boolean diff --git a/HISTORY.md b/HISTORY.md index e69de29b..2c3616d4 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -0,0 +1,705 @@ +# Changelog + + +## 2.6.2 (2021-11-14) + +### Changed + +* Removing support for Odoo 15. [Luis Alejandro Martínez Faneyth] + +* Adding support for Node 17 and Odoo 15. Removing support for Ruby 2.5. [Luis Alejandro Martínez Faneyth] + +* Changing action day. [Luis Alejandro Martínez Faneyth] + + +### Fixed + +* Fixing github builds. [Luis Alejandro Martínez Faneyth] + + +### Other + +* Bump flake8 from 3.9.2 to 4.0.1. [dependabot[bot]] + +* Bump coverage from 5.5 to 6.1.2. [dependabot[bot]] + +* Bump virtualenv from 20.8.1 to 20.10.0. [dependabot[bot]] + +* Bump virtualenv from 20.8.0 to 20.8.1. [dependabot[bot]] + +* Bump actions/github-script from 4.1 to 5. [dependabot[bot]] + +* Bump virtualenv from 20.7.2 to 20.8.0. [dependabot[bot]] + +* Bump tox from 3.24.3 to 3.24.4. [dependabot[bot]] + + +## 2.6.1 (2021-09-13) + +### Changed + +* Fixing odoo build. Removing support for Node 11 and 13. [Luis Alejandro Martínez Faneyth] + +* Removing support for Mongo 3.6 and 4.0, Python 3.7 and Debian Stretch. [Luis Alejandro Martínez Faneyth] + + +### Other + +* Bump wheel from 0.36.2 to 0.37.0. [dependabot[bot]] + +* Bump virtualenv from 20.7.0 to 20.7.2. [dependabot[bot]] + + +## 2.6.0 (2021-08-04) + +### Changed + +* Adding support for Mongo 5.0, Python 3.10, Node 16, Postgres 14 and Ruby 3.0. [Luis Alejandro Martínez Faneyth] + +* Removing support for python 3.5 & 3.6. [Luis Alejandro Martínez Faneyth] + +* Restricting update of pydocstyle. [Luis Alejandro Martínez Faneyth] + +* Restricting update of conflicting python packages. [Luis Alejandro Martínez Faneyth] + +* Adding auto approve pull request. [Luis Alejandro Martínez Faneyth] + +* No longer updating Node 8 and 9 images. [Luis Alejandro Martínez Faneyth] + +* Fixing python and ruby images. [Luis Alejandro Martínez Faneyth] + +* Separating schedule workflow. [Luis Alejandro Martínez Faneyth] + + +### Fixed + +* Fixing setuptools version. [Luis Alejandro Martínez Faneyth] + +* Fixing github actions workflow. [Luis Alejandro Martínez Faneyth] + +* Fixing pull request permissions. [Luis Alejandro Martínez Faneyth] + + +### Other + +* Bump virtualenv from 20.6.0 to 20.7.0. [dependabot[bot]] + +* Bump tox from 3.23.1 to 3.24.1. [dependabot[bot]] + +* Bump virtualenv from 20.4.7 to 20.6.0. [dependabot[bot]] + +* Bump coveralls from 3.1.0 to 3.2.0. [dependabot[bot]] + +* Bump packaging from 20.9 to 21.0. [dependabot[bot]] + +* Bump coveralls from 3.0.1 to 3.1.0. [dependabot[bot]] + +* Bump virtualenv from 20.4.6 to 20.4.7. [dependabot[bot]] + +* Bump virtualenv from 20.4.4 to 20.4.6. [dependabot[bot]] + +* Bump flake8 from 3.9.1 to 3.9.2. [dependabot[bot]] + +* Bump tox from 3.23.0 to 3.23.1. [dependabot[bot]] + +* Bump virtualenv from 20.4.3 to 20.4.4. [dependabot[bot]] + +* Bump actions/github-script from v3 to v4.0.2. [dependabot[bot]] + +* Bump flake8 from 3.9.0 to 3.9.1. [dependabot[bot]] + +* Bump lxml from 4.6.2 to 4.6.3. [dependabot[bot]] + +* Bump coveralls from 3.0.0 to 3.0.1. [dependabot[bot]] + +* Bump hmarr/auto-approve-action from v2.0.0 to v2.1.0. [dependabot[bot]] + +* Bump virtualenv from 20.4.2 to 20.4.3. [dependabot[bot]] + +* Bump pydocstyle from 5.1.1 to 6.0.0. [dependabot[bot]] + +* Bump tox from 3.21.4 to 3.23.0. [dependabot[bot]] + +* Bump flake8 from 3.8.4 to 3.9.0. [dependabot[bot]] + +* Bump coverage from 5.4 to 5.5. [dependabot[bot]] + +* Bump setuptools from 50.3.2 to 54.1.2. [dependabot[bot]] + + +## 2.5.5 (2021-02-14) + +### Changed + +* Adding maintainer requirements. [Luis Alejandro Martínez Faneyth] + +* Adding support for Node 15. [Luis Alejandro Martínez Faneyth] + +* Migrating from Travis to Github Actions. [Luis Alejandro Martínez Faneyth] + +* Updating Readme. [Luis Alejandro Martínez Faneyth] + + +## 2.5.4 (2020-10-09) + +### Added + +* Adding Python 3.7 and Odoo 14 support. [REF] Improving badges. [Luis Alejandro Martínez Faneyth] + + +### Changed + +* Changing references to art images. [Luis Alejandro Martínez Faneyth] + +* Resizing art images. [Luis Alejandro Martínez Faneyth] + + +## 2.5.3 (2020-09-18) + +### Changed + +* Improving latex:full building script. [Luis Alejandro Martínez Faneyth] + +* Adding python3-pygments to latex:full so that pygmentize can work properly (fixes #33). [FIX] Fixing Node builds. [Luis Alejandro Martínez Faneyth] + + +## 2.5.2 (2020-08-07) + +### Fixed + +* Fixing Docker Hub credentials. [Luis Alejandro Martínez Faneyth] + + +## 2.5.1 (2020-08-07) + +### Changed + +* Minor clean. [Luis Alejandro Martínez Faneyth] + + +### Fixed + +* Fixing test for mongo 4.4. [Luis Alejandro Martínez Faneyth] + +* Fixing Mongo build. [Luis Alejandro Martínez Faneyth] + +* Fixing Node images. [REF] Adding support for Mongo 4.4. [REF] Updating Odoo images to use Node 12. [Luis Alejandro Martínez Faneyth] + + +## 2.5.0 (2020-07-25) + +### Changed + +* Adding support for Node 14, Postgres 13, Python 3.9 and removing support for Python 3.7. [Luis Alejandro Martínez Faneyth] + + +## 2.4.3 (2020-06-05) + +### Changed + +* Fixing python build. [Luis Alejandro Martínez Faneyth] + + +## 2.4.2 (2020-06-02) + +### Changed + +* Fixing libgcc1 Debian error (see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=961990). [REF] Fixing PHP build. [Luis Alejandro Martínez Faneyth] + +* Fixing Python and Ruby builds. [Luis Alejandro Martínez Faneyth] + + +## 2.4.1 (2020-04-08) + +### Fixed + +* Fixing MOTD behavior. [FIX] Fixing DEBIAN_SUITE variable. [FIX] Fixing python tests. [Luis Alejandro Martínez Faneyth] + + +## 2.4.0 (2020-03-27) + +### Changed + +* Removing support for Ruby 1.8 && 1.9.1 and adding support for Ruby 2.7. [Luis Alejandro Martínez Faneyth] + + +### Fixed + +* Fixing php 7.3 build. [Luis Alejandro Martínez Faneyth] + + +## 2.3.2 (2020-02-20) + +### Changed + +* Reorganizing url holders. [Luis Alejandro Martínez Faneyth] + +* Replacing banner images on readmes. [Luis Alejandro Martínez Faneyth] + +* Disabling https pn debian mirrors to avoid installing ca-certificates. [REF] Updating logo images. [Luis Alejandro Martínez Faneyth] + + +### Fixed + +* Fixing debian images building. [Luis Alejandro Martínez Faneyth] + + +## 2.3.1 (2020-01-18) + +### Changed + +* Enabling build for all images. [Luis Alejandro Martínez Faneyth] + +* Correcting URLs. [Luis Alejandro Martínez Faneyth] + +* Removing support for Debian oldoldstable suite. [Luis Alejandro Martínez Faneyth] + +* Removing support for: [Luis Alejandro Martínez Faneyth] + +* Applying rebranding. [Luis Alejandro Martínez Faneyth] + + +### Fixed + +* Fixing mongo 4.2 test. [Luis Alejandro Martínez Faneyth] + +* Fixing mongo 4.2 image build. [Luis Alejandro Martínez Faneyth] + + +## 2.3.0 (2019-07-14) + +### Changed + +* Removing print. [Luis Alejandro Martínez Faneyth] + +* Adding Postgres 12. [DEL] Removing Wheezy from Debian images. [Luis Alejandro Martínez Faneyth] + +* Adding Bullseye Debian release. [FIX] Fixing Python 3.8 build. [REF] Changing MAINTAINER field to LABEL. [Luis Alejandro Martínez Faneyth] + + +### Fixed + +* Fixing Apache conf. [Luis Alejandro Martínez Faneyth] + +* Fixing execution permissions for php cmd. [Luis Alejandro Martínez Faneyth] + + +## 2.2.0 (2019-06-24) + +### Changed + +* Improving PHP shelves. [Luis Alejandro Martínez Faneyth] + +* Adding PHP shelves. [Luis Alejandro Martínez Faneyth] + + +### Fixed + +* Fixing build. [Luis Alejandro Martínez Faneyth] + + +## 2.1.5 (2019-05-19) + +### Changed + +* Updating new versions of Node and Python. [Luis Alejandro Martínez Faneyth] + +* Improving update scripts. [Luis Alejandro Martínez Faneyth] + +* Allow expired resources on debian mirrors. [Luis Alejandro Martínez Faneyth] + + +### Fixed + +* Fixing Python 3.8 build. [Luis Alejandro Martínez Faneyth] + +* Fixing erasing of wheezy and jessie from main debian archive. [Luis Alejandro Martínez Faneyth] + + +## 2.1.4 (2019-03-07) + +### Changed + +* Updating Node versions. [FIX] Fixing python 3.7 build. [Luis Alejandro Martínez Faneyth] + + +### Fixed + +* Fixing repository authorization. [Luis Alejandro Martínez Faneyth] + + +## 2.1.3 (2019-01-28) + +### Fixed + +* Fixing Python 3.6 build. [Luis Alejandro Martínez Faneyth] + + +## 2.1.2 (2018-12-14) + +### Changed + +* Updating license file to match github's automatic recognition. [Luis Alejandro Martínez Faneyth] + + +### Fixed + +* Fixing python 2.7 tests. [Luis Alejandro Martínez Faneyth] + +* Fixing python 3.6 & 3.7 tests. [Luis Alejandro Martínez Faneyth] + + +## 2.1.1 (2018-12-12) + +### Changed + +* Updating Odoo and Mongo versions. [Luis Alejandro Martínez Faneyth] + + +### Fixed + +* Fixing Odoo build. [Luis Alejandro Martínez Faneyth] + + +## 2.1.0 (2018-08-07) + +### Added + +* Adding docker entrypoint and configuration for Odoo. [REF] Improving Odoo documentation. [Luis Alejandro Martínez Faneyth] + + +### Changed + +* Improving documentation. [Luis Alejandro Martínez Faneyth] + +* Finishing Odoo images (closes #30). [Luis Alejandro Martínez Faneyth] + +* Adding 'latest' tags (closes #32). [Luis Alejandro Martínez Faneyth] + +* Adding full version image for Latex (closes #31). [Luis Alejandro Martínez Faneyth] + +* Improving Dockerfiles. [Luis Alejandro Martínez Faneyth] + +* Update Odoo Dockerfiles. [Luis Alejandro Martínez Faneyth] + +* Updating odoo images versions. [REF] Improving generation scripts. [Luis Alejandro Martínez Faneyth] + +* Adding Odoo image. [REF] Adding requirements.txt. [Luis Alejandro Martínez Faneyth] + + +### Fixed + +* Fixing latex build. [Luis Alejandro Martínez Faneyth] + + +## 2.0.2 (2018-08-02) + +### Fixed + +* Fixing badges. [Luis Alejandro Martínez Faneyth] + + +## 2.0.1 (2018-08-01) + +### Changed + +* Improving documentation and graphics in general. [REF] Adding dummy hooks to trigger an automatic build on Docker Hub with the purpose of updating full description. [REF] Replacing gitcdn.xyz with cdn.rawgit.com. [Luis Alejandro Martínez Faneyth] + +* Improving gitchangelog parsing. [REF] Improving README. [Luis Alejandro Martínez Faneyth] + + +## 2.0.0 (2018-07-31) + +### Added + +* Adding Python 3.7. [ADD] Adding Mongo 4.0. [ADD] Adding Postgres images. [Luis Alejandro Martínez Faneyth] + + +### Changed + +* Improving README. [Luis Alejandro Martínez Faneyth] + +* Improving documentation. [FIX] Fixing Postgres build. [Luis Alejandro Martínez Faneyth] + +* Removing the behavior of nor creating the main cluster [postgres]. [REF] Adding Postgres tests. [Luis Alejandro Martínez Faneyth] + +* Configuring aptitude to not ask questions and trust everything. [Luis Alejandro Martínez Faneyth] + +* Moving images to a folder. [REF] Moving python script to folder. [REF] Changing paths. [FIX] Fixing Mongo 4.0 build. [Luis Alejandro Martínez Faneyth] + +* Copy Mongo test files if we are building it. [REF] Add more test cases for Latex image. [REF] Improve package version pinning when installing from foreign repositories. [REF] Add more test cases for Mongo image. [REF] Add more test cases for Node image. [REF] Installing python3-distutils in python 3.6. [Luis Alejandro Martínez Faneyth] + +* Sorting versions in descending order on .travis.yml. [REF] Improving Readme. [REF] Adding entrypoint to Mongo. [REF] Completing ruby configuration. [Luis Alejandro Martínez Faneyth] + +* Improving documentation and scripts. [Luis Alejandro Martínez Faneyth] + +* Adding ruby images based in python images. [Luis Alejandro Martínez Faneyth] + +* Removing debian stable images. [Luis Alejandro Martínez Faneyth] + +* Changing the way that python images are built. [REF] Changing image maintainer email. [REF] Improving test cases. [Luis Alejandro Martínez Faneyth] + +* Changing image maintainer email. [REF] Removing debian stable images. [Luis Alejandro Martínez Faneyth] + +* Removing unstable versions of Mongo. [REF] Completing development of Mongo shelf build script. [Luis Alejandro Martínez Faneyth] + +* Changing maintainer email. [Luis Alejandro Martínez Faneyth] + +* Removing debian stable python versions. [REF] Rolling back to compiling of python. [Luis Alejandro Martínez Faneyth] + +* Configuring iproute package for Wheezy and iproute2 for the rest. [REF] Building minimal base (debootstrap) with docker except for Wheezy. [Luis Alejandro Martínez Faneyth] + +* Adding scripts to automate the generarion of Dockerfiles and Readmes. [REF] Adding Mongo and Node images. [Luis Alejandro Martínez Faneyth] + + +### Fixed + +* Fixing Postgres 11 & 12 build. [Luis Alejandro Martínez Faneyth] + +* Fixing Postgres build. [Luis Alejandro Martínez Faneyth] + +* Fixing Postgres build. [Luis Alejandro Martínez Faneyth] + +* Fixing Postgres build. [Luis Alejandro Martínez Faneyth] + +* Fixing Mongo test. [Luis Alejandro Martínez Faneyth] + +* Fixing typo in Dockerfiles. [Luis Alejandro Martínez Faneyth] + + +### Removed + +* [DEL] Removing Mongo 3.0 because is too much difficult to make it work and Postgres 12 because is not ready yet. [Luis Alejandro Martínez Faneyth] + +* [DEL] Removing python 3.7 because is not stable yet. [ADD] Including js scripts to test mongo. [REF] Improving bash prompt design and colors. [REF] Improving documentation. [FIX] Fixing pip installation. [Luis Alejandro Martínez Faneyth] + + +## 0.1.5 (2017-07-08) + +### Fixed + +* Fixing debian stretch test case. [FIX] The package latex-xcolor doesn't exist anymore, xcolor is now provided by texlive-latex-recommended. [Luis Alejandro martínez Faneyth] + + +## 0.1.4 (2017-05-04) + +### Changed + +* Fixing location of python 3.6 source package. Fixes #15. [Luis Alejandro Martínez Faneyth] + +* Adding build script for latex image to avoid apt timeouts. [REF] Various improvements. [Luis Alejandro Martínez Faneyth] + +* Adding routine to avoid errors on downloading packages. [REF] Installing PyPIContents for python 3.5 in dockershelf/pypicontents:2.7-3.5 (closes: #13). [Luis Alejandro Martínez Faneyth] + + +## 0.1.3 (2017-01-04) + +### Fixed + +* Correcting typo for python:2.7-3.5 image (closes #10). [Luis Alejandro Martínez Faneyth] + + +## 0.1.2 (2017-01-03) + +### Added + +* Adding Maintainer notes. [Luis Alejandro Martínez Faneyth] + +* Adding maintainer notes. [DEL] Removing bumpversion configuration. [REF] Improving READMEs. [REF] Improving test scripts. [Luis Alejandro Martínez Faneyth] + + +### Changed + +* Fixing build, improving test scripts. [Luis Alejandro Martínez Faneyth] + +* Updating date on copyright boilerplate. [REF] Adding sample tex file for latex image. [REF] Finishing test scripts (closes #2). [Luis Alejandro Martínez Faneyth] + +* Limiting travis build to develop and master branches. [REF] Adding case for -dev images. [Luis Alejandro Martínez Faneyth] + +* Adding functionality for pushing to an alternate development version tag for when not pushing from master branch. [REF] Restoring force-overwrite config because som images fail to build. [REF] Adding test scripts for latex and pypicontents. [REF] Improving Debian & Python test scripts. [REF] Adding default CMD to dockerfiles. [Luis Alejandro Martínez Faneyth] + +* Improving test script. [Luis Alejandro Martínez Faneyth] + +* Reorganizing code. [ADD] Adding project boilerplate (CLA.md, AUTHORS.md, etc). [Luis Alejandro Martínez Faneyth] + +* First working version of Docker file unit tests. [Luis Alejandro Martínez Faneyth] + +* Changing name and graphical image to Dockershelf! [Luis Alejandro Martínez Faneyth] + +* Extending no-output restriction to 40min on Travis. [REF] Installing setuptools<30 for python 3.2. [Luis Alejandro Martínez Faneyth] + + +### Fixed + +* Replacing pypicontents for virtualenv because it breaks tests. [Luis Alejandro Martínez Faneyth] + +* Fixing dockershelf/debian:stretch test. [Luis Alejandro Martínez Faneyth] + +* Folder names changed. Correcting. [REF] Changing rspec report format. [Luis Alejandro Martínez Faneyth] + +* Fixing typo. [Luis Alejandro Martínez Faneyth] + +* Fixing installation of pip in python 3.2. [Luis Alejandro Martínez Faneyth] + +* Fixing cmdretry. [Luis Alejandro Martínez Faneyth] + +* Removing reinstall of pip because causes to install a new version on 3.2 image which breaks pip. [FIX] Fixing typo. [Luis Alejandro Martínez Faneyth] + +* Changing tag 2.7+3.5 -> 2.7and3.5 because its invalid. [REF] Rewriting process of installing runtime dependencies because sometimes fails. [Luis Alejandro Martínez Faneyth] + + +## 0.1.1 (2016-12-29) + +### Changed + +* Updating Changelog and version. [Luis Alejandro Martínez Faneyth] + +* Adding version to README. [Luis Alejandro Martínez Faneyth] + +* Only pushing images if they come from a cron and the master branch (closes #7). [Luis Alejandro Martínez Faneyth] + +* Changing dockershelf/python:2.7and3.5 to dockershelf/python:2.7-3.5 because it was too long. [REF] Changing SVG files location to root folder. [REF] Improving README file, adding README's to every type of image because its useful and to reuse in Docker Hub long description. [REF] Improving build scripts. [REF] Changing label-schema namespace. [REF] Adding default CMD to Dockerfiles. [Luis Alejandro Martínez Faneyth] + +* Updating docker hub password. [Luis Alejandro Martínez Faneyth] + +* Adding logo. [REF] Removing curl to MicroBadger API because it can be configured as a webhook in docker hub. [REF] Improving scripts. [Luis Alejandro Martínez Faneyth] + +* Changing namespace of images from luisalejandro to dockershelf. [REF] Using debootstrap to generate base image instead of reusing tianon's image (closes #8). [REF] Adding fancy Motd, installing bash-completion and modifying prompt (closes #6). [REF] General improvements for debian images build script. [Luis Alejandro Martínez Faneyth] + +* Removing unnecessary code. [Luis Alejandro Martínez Faneyth] + +* Removing unnecessary code. [Luis Alejandro Martínez Faneyth] + + +### Fixed + +* Fixing cleartext password on Travis. [Luis Alejandro Martínez Faneyth] + +* Fixing build. [Luis Alejandro Martínez Faneyth] + + +## 0.1.0 (2016-12-21) + +### Added + +* .travis.yml: Trigger a build on hub.docker.com if the cron tells us to. [REF] README.md: Start to write the readme. [ADD] banner.svg: Give us a nice banner. [REF] Importing Dockerfiles of pypicontents and curriculum-vitae. [REF] Making use of Docker hooks to allow building the chroot in the docker hub. [Luis Alejandro Martínez Faneyth] + +* Adding scripts for building sid image. [Luis Alejandro Martínez Faneyth] + +* Adding Dockerfile for python image. [Luis Alejandro Martínez Faneyth] + + +### Changed + +* Reorganizing code. [ADD] Adding project boilerplate (CLA.md, AUTHORS.md, etc). [Luis Alejandro Martínez Faneyth] + +* Changing name and graphical image to Dockershelf! [Luis Alejandro Martínez Faneyth] + +* Extending no-output restriction to 40min on Travis. [REF] Installing setuptools<30 for python 3.2. [Luis Alejandro Martínez Faneyth] + +* Adding initial codebase for 2.7+3.5 Python image. [Luis Alejandro Martínez Faneyth] + +* Improving discovery and installation of Build-Depends and Depends (closes #1). [Luis Alejandro Martínez Faneyth] + +* Removing duplicate scripts because they are no longer necessary. [ADD] Creating travis-build-image.sh for building the image in Travis. [REF] Refactoring .travis.yml to build and push images to Docker Hub (closes #5). [Luis Alejandro Martínez Faneyth] + +* Removing duplicate scripts because they are no longer necessary. [ADD] Creating travis-build-image.sh for building the image in Travis. [Luis Alejandro Martínez Faneyth] + +* Improving method for getting Build-Depends and Depends. [REF] Unifying PIPURL. [Luis Alejandro Martínez Faneyth] + +* Improving installation of build dependencies on python images. [Luis Alejandro Martínez Faneyth] + +* Improving README. [REF] Updating MicroBadger and Docker Hub triggers. [REF] Adding security and updates mirrors to debian images. [FIX] Correct build hooks for some images. [Luis Alejandro Martínez Faneyth] + +* Changing name to tags. [Luis Alejandro Martínez Faneyth] + +* Adjusting dependencies and removing path-exclude config from dpkg because it fucks up locales configuration. [Luis Alejandro Martínez Faneyth] + +* Improving build scripts. [Luis Alejandro Martínez Faneyth] + +* Converting generation of images to a more standard method to avoid borderline issues. [Luis Alejandro Martínez Faneyth] + +* Configuring DNS. [Luis Alejandro Martínez Faneyth] + +* Fixing debian suites. [Luis Alejandro Martínez Faneyth] + +* Changing mirror. [Luis Alejandro Martínez Faneyth] + +* Fixing build. [Luis Alejandro Martínez Faneyth] + +* Fixing build. [Luis Alejandro Martínez Faneyth] + +* Correcting temporary failure of debian cdn. [Luis Alejandro Martínez Faneyth] + +* Adding wheezy-min and jessie-min to compyle python 2.6, 3.2 and 3.4. [Luis Alejandro Martínez Faneyth] + +* Python: Adding suite dependecies to sources.list. [Luis Alejandro Martínez Faneyth] + +* Removing push of base tarball from Travis. [Luis Alejandro Martínez Faneyth] + +* Moving the build script to a pre_build hook. [Luis Alejandro Martínez Faneyth] + +* Changing label schema for dockerfiles. [REF] Adding curl and ca-certificates to base image. [REF] Fixing typo on DEB_BUILD_OPTIONS. [REF] Installing runtime dependencies for Python. [REF] .travis.yml: Adding an encrypted access key fro github, to be able to push from Travis. [REF] debian/sid-min/base.tar.xz: Adding a base tarball to be used in the Dockerfile. [REF] debian/sid-min/build-base.sh: Improving base build script. [REF] Removing the need for wget in python images. [Luis Alejandro Martínez Faneyth] + +* .travis.yml: adding POST to MicroBadger API so that they stop being lazy. [REF] Improving README. [REF] Testing if Docker Hub likes my hooks/pre_build. [Luis Alejandro Martínez Faneyth] + +* Removing --merged-usr because hub.docker.com doesn't support it. [Luis Alejandro Martínez Faneyth] + + +### Fixed + +* Fixing typo. [Luis Alejandro Martínez Faneyth] + +* Fixing installation of pip in python 3.2. [Luis Alejandro Martínez Faneyth] + +* Fixing cmdretry. [Luis Alejandro Martínez Faneyth] + +* Removing reinstall of pip because causes to install a new version on 3.2 image which breaks pip. [FIX] Fixing typo. [Luis Alejandro Martínez Faneyth] + +* Changing tag 2.7+3.5 -> 2.7and3.5 because its invalid (closes #4). [REF] Rewriting process of installing runtime dependencies because sometimes fails. [Luis Alejandro Martínez Faneyth] + +* Fixing sourcing library.sh. [REF] Improving build scripts. [Luis Alejandro Martínez Faneyth] + +* Travis_retry doesn't work on scripts. Reimplementing. [Luis Alejandro Martínez Faneyth] + +* Wheezy doesn't build because iproute2 doesn't exist. Replacing with iproute which is a dummy package. [REF] Adding travis_retry because sometimes network times out. [FIX] Adding dpkg-dev to DPKG_PRE_DEPENDS in luisalejandro/python because apt-get source can't work without it. [Luis Alejandro Martínez Faneyth] + +* Fixing luisalejandro/latex build. [REF] Changing location of scripts inside image. [Luis Alejandro Martínez Faneyth] + +* Updating Docker Hub password. [Luis Alejandro Martínez Faneyth] + +* Fixing /etc/apt/sources.list. [Luis Alejandro Martínez Faneyth] + +* Fixing docker hub password. [FIX] Fixing processing of MicroBadger API end. [FIX] Fixing debian build script. [Luis Alejandro Martínez Faneyth] + +* Fixing luisalejandro/latex build. [REF] Changing location of scripts inside image. [Luis Alejandro Martínez Faneyth] + +* Updating Docker Hub password. [Luis Alejandro Martínez Faneyth] + +* Fixing /etc/apt/sources.list. [Luis Alejandro Martínez Faneyth] + +* Fixing docker hub password. [FIX] Fixing processing of MicroBadger API end. [FIX] Fixing debian build script. [Luis Alejandro Martínez Faneyth] + +* PyPIrazzi no longer exists, renaming to pypicontents. [Luis Alejandro Martínez Faneyth] + +* Fixing build of 3.2 and 2.6. [Luis Alejandro Martínez Faneyth] + +* Fixing build for early versions of python (2.6, 3.2). [Luis Alejandro Martínez Faneyth] + +* Fixing installation of build dependencies. [Luis Alejandro Martínez Faneyth] + +* Fixing typo. [Luis Alejandro Martínez Faneyth] + +* Fixing wheezy build. [Luis Alejandro Martínez Faneyth] + + +### Other + +* Adding debootstrap to sid-build dependencies. [Luis Alejandro Martínez Faneyth] + +* Redifining structure of pypicontents to be able to use hooks at hub.docker.com. [Luis Alejandro Martínez Faneyth] + +* Testing if docker pre_build accepts installing packages. [Luis Alejandro Martínez Faneyth] + +* Initial commit. [Luis Alejandro Martínez Faneyth] + diff --git a/README.md b/README.md index c97b5ce7..fd74966a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![](https://img.shields.io/github/release/Dockershelf/dockershelf.svg)](https://github.com/Dockershelf/dockershelf/releases) [![](https://img.shields.io/travis/Dockershelf/dockershelf.svg)](https://travis-ci.org/Dockershelf/dockershelf) [![](https://img.shields.io/github/issues-raw/Dockershelf/dockershelf/in%20progress.svg?label=in%20progress)](https://github.com/Dockershelf/dockershelf/issues?q=is%3Aissue+is%3Aopen+label%3A%22in+progress%22) [![](https://badges.gitter.im/Dockershelf/dockershelf.svg)](https://gitter.im/Dockershelf/dockershelf) [![](https://cla-assistant.io/readme/badge/Dockershelf/dockershelf)](https://cla-assistant.io/Dockershelf/dockershelf) -Current version: 2.6.1 +Current version: 2.6.2 *Dockershelf* is a repository that serves as a collector for docker recipes that are universal, efficient and slim. We keep adding "shelves", which are holders for the different versions of a popular language or application. diff --git a/README.md.template b/README.md.template index ed1390b0..e751769a 100644 --- a/README.md.template +++ b/README.md.template @@ -4,7 +4,7 @@ [![](https://img.shields.io/github/release/Dockershelf/dockershelf.svg)](https://github.com/Dockershelf/dockershelf/releases) [![](https://img.shields.io/travis/Dockershelf/dockershelf.svg)](https://travis-ci.org/Dockershelf/dockershelf) [![](https://img.shields.io/github/issues-raw/Dockershelf/dockershelf/in%20progress.svg?label=in%20progress)](https://github.com/Dockershelf/dockershelf/issues?q=is%3Aissue+is%3Aopen+label%3A%22in+progress%22) [![](https://badges.gitter.im/Dockershelf/dockershelf.svg)](https://gitter.im/Dockershelf/dockershelf) [![](https://cla-assistant.io/readme/badge/Dockershelf/dockershelf)](https://cla-assistant.io/Dockershelf/dockershelf) -Current version: 2.6.1 +Current version: 2.6.2 *Dockershelf* is a repository that serves as a collector for docker recipes that are universal, efficient and slim. We keep adding "shelves", which are holders for the different versions of a popular language or application.