Merge branch 'release/2.8.0'

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.7.1
+current_version = 2.8.0
 tag_name = {new_version}
 commit = True
 tag = True

HISTORY.md

@@ -1,6 +1,22 @@
 # Changelog
 
 
+## 2.8.0 (2022-04-28)
+
+### Changed
+
+* Removing support for Mongo, Postgres, Python 3.6 and PHP. [Luis Alejandro Martínez Faneyth]
+
+* Adding support for Node 18. [DEL] Removing support for Postgres 9.6, Node 15 and Node 17. [Luis Alejandro Martínez Faneyth]
+
+* Improving documentation. [Luis Alejandro Martínez Faneyth]
+
+
+### Fixed
+
+* Fixing typo. [Luis Alejandro Martínez Faneyth]
+
+
 ## 2.7.1 (2022-04-17)
 
 ### Changed

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/github/workflow/status/Dockershelf/dockershelf/Schedule%20(master%20branch))](https://github.com/Dockershelf/dockershelf/actions/workflows/schedule-master.yml) [![](https://img.shields.io/discord/809504357359157288)](https://discord.gg/4Wc7xphH5e) [![](https://cla-assistant.io/readme/badge/Dockershelf/dockershelf)](https://cla-assistant.io/Dockershelf/dockershelf)
 
-Current version: 2.7.1
+Current version: 2.8.0
 
 *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.
 

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/github/workflow/status/Dockershelf/dockershelf/Schedule%20(master%20branch))](https://github.com/Dockershelf/dockershelf/actions/workflows/schedule-master.yml) [![](https://img.shields.io/discord/809504357359157288)](https://discord.gg/4Wc7xphH5e) [![](https://cla-assistant.io/readme/badge/Dockershelf/dockershelf)](https://cla-assistant.io/Dockershelf/dockershelf)
 
-Current version: 2.7.1
+Current version: 2.8.0
 
 *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.
 

odoo/build-image.sh

@@ -92,10 +92,7 @@ cmdretry apt-get install \
     node-less \
     npm \
     libpq-dev \
-<<<<<<< HEAD
     build-essential \
-=======
->>>>>>> b792e86e0f83afbdb8643c293139f7a497d1949d
     postgresql-client \
     python3-dev \
     python3-num2words \