Skip to content

Commit

Permalink
Merge branch 'release/2.5.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
LuisAlejandro committed Oct 9, 2020
2 parents 5e4f820 + c143edf commit 2185773
Show file tree
Hide file tree
Showing 39 changed files with 1,084 additions and 988 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.5.3
current_version = 2.5.4
tag_name = {new_version}
commit = True
tag = True
Expand Down
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ env:
- DOCKER_IMAGE_NAME="dockershelf/python:2.7" DOCKER_IMAGE_EXTRA_TAGS="dockershelf/python:2"
- DOCKER_IMAGE_NAME="dockershelf/python:3.5"
- DOCKER_IMAGE_NAME="dockershelf/python:3.6"
- DOCKER_IMAGE_NAME="dockershelf/python:3.7"
- DOCKER_IMAGE_NAME="dockershelf/python:3.8" DOCKER_IMAGE_EXTRA_TAGS="dockershelf/python:3"
- DOCKER_IMAGE_NAME="dockershelf/python:3.9" DOCKER_IMAGE_EXTRA_TAGS="dockershelf/python:latest"
- DOCKER_IMAGE_NAME="dockershelf/ruby:2.1"
Expand All @@ -54,7 +55,8 @@ env:
- DOCKER_IMAGE_NAME="dockershelf/postgres:13" DOCKER_IMAGE_EXTRA_TAGS="dockershelf/postgres:latest"
- DOCKER_IMAGE_NAME="dockershelf/odoo:11.0"
- DOCKER_IMAGE_NAME="dockershelf/odoo:12.0"
- DOCKER_IMAGE_NAME="dockershelf/odoo:13.0" DOCKER_IMAGE_EXTRA_TAGS="dockershelf/odoo:latest"
- DOCKER_IMAGE_NAME="dockershelf/odoo:13.0"
- DOCKER_IMAGE_NAME="dockershelf/odoo:14.0" DOCKER_IMAGE_EXTRA_TAGS="dockershelf/odoo:latest"
- DOCKER_IMAGE_NAME="dockershelf/php:7.0"
- DOCKER_IMAGE_NAME="dockershelf/php:7.2"
- DOCKER_IMAGE_NAME="dockershelf/php:7.3"
Expand Down
13 changes: 13 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
# Changelog


## 2.5.4 (2020-10-09)

### New

* Adding Python 3.7 and Odoo 14 support. [REF] Improving badges. [Luis Alejandro Martínez Faneyth]

### Changes

* Changing references to art images. [Luis Alejandro Martínez Faneyth]

* Resizing art images. [Luis Alejandro Martínez Faneyth]


## 2.5.3 (2020-09-18)

### Changes
Expand Down
102 changes: 52 additions & 50 deletions README.md

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions README.md.template
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
![](https://rawcdn.githack.com/Dockershelf/dockershelf/4db25518b4ed4507a278c56575072649fc52503a/images/banner.svg)
![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/banner.svg)

---

[![](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.5.3
Current version: 2.5.4

*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.

Expand All @@ -20,7 +20,7 @@ These images are similar to the official ones, but with some improved configurat
|-------|---------|------------|--------|------|
%%DEBIAN_TABLE%%

![](https://rawcdn.githack.com/Dockershelf/dockershelf/42161077720b74d46b2ed8e51cb5bb958bb0406a/images/table.svg)
![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/table.svg)

### Python

Expand All @@ -30,7 +30,7 @@ These are python images with native debian packages that are extracted from diff
|-------|---------|------------|--------|------|
%%PYTHON_TABLE%%

![](https://rawcdn.githack.com/Dockershelf/dockershelf/42161077720b74d46b2ed8e51cb5bb958bb0406a/images/table.svg)
![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/table.svg)

### Ruby

Expand All @@ -40,7 +40,7 @@ These are ruby images with native debian packages that are extracted from differ
|-------|---------|------------|--------|------|
%%RUBY_TABLE%%

![](https://rawcdn.githack.com/Dockershelf/dockershelf/42161077720b74d46b2ed8e51cb5bb958bb0406a/images/table.svg)
![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/table.svg)

### Node

Expand All @@ -50,7 +50,7 @@ These are Node images built using the [nodesource installation script](https://n
|-------|---------|------------|--------|------|
%%NODE_TABLE%%

![](https://rawcdn.githack.com/Dockershelf/dockershelf/42161077720b74d46b2ed8e51cb5bb958bb0406a/images/table.svg)
![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/table.svg)

### Mongo

Expand All @@ -60,7 +60,7 @@ These are Mongo images built using the [official installation guide](https://doc
|-------|---------|------------|--------|------|
%%MONGO_TABLE%%

![](https://rawcdn.githack.com/Dockershelf/dockershelf/42161077720b74d46b2ed8e51cb5bb958bb0406a/images/table.svg)
![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/table.svg)

### Postgres

Expand All @@ -70,7 +70,7 @@ These are PostgreSQL images built using the [official installation guide](https:
|-------|---------|------------|--------|------|
%%POSTGRES_TABLE%%

![](https://rawcdn.githack.com/Dockershelf/dockershelf/42161077720b74d46b2ed8e51cb5bb958bb0406a/images/table.svg)
![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/table.svg)

### Latex

Expand All @@ -80,7 +80,7 @@ This is a Latex image built with the following packages installed: `texlive-font
|-------|---------|------------|--------|------|
%%LATEX_TABLE%%

![](https://rawcdn.githack.com/Dockershelf/dockershelf/42161077720b74d46b2ed8e51cb5bb958bb0406a/images/table.svg)
![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/table.svg)

### Odoo

Expand All @@ -90,7 +90,7 @@ These images are similar to the official ones, but with some improved configurat
|-------|---------|------------|--------|------|
%%ODOO_TABLE%%

![](https://rawcdn.githack.com/Dockershelf/dockershelf/42161077720b74d46b2ed8e51cb5bb958bb0406a/images/table.svg)
![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/table.svg)

### PHP

Expand All @@ -99,7 +99,7 @@ These images are similar to the official ones, but with some improved configurat
|-------|---------|------------|--------|------|
%%PHP_TABLE%%

![](https://rawcdn.githack.com/Dockershelf/dockershelf/42161077720b74d46b2ed8e51cb5bb958bb0406a/images/table.svg)
![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/table.svg)

## How to download

Expand Down Expand Up @@ -129,6 +129,6 @@ bash build-image.sh [docker image name]

## Made with :heart: and :hamburger:

![Banner](https://rawcdn.githack.com/Dockershelf/dockershelf/42161077720b74d46b2ed8e51cb5bb958bb0406a/images/promo-open-source.svg)
![Banner](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/promo-open-source.svg)

> Web [collagelabs.org](http://collagelabs.org/) · GitHub [@CollageLabs](https://github.com/CollageLabs) · Twitter [@CollageLabs](https://twitter.com/CollageLabs)
14 changes: 7 additions & 7 deletions debian/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![](https://rawcdn.githack.com/Dockershelf/dockershelf/4db25518b4ed4507a278c56575072649fc52503a/images/banner.svg)
![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/banner.svg)

---

Expand All @@ -8,12 +8,12 @@

|Image |Release |Dockerfile |Layers |Size |
|-------|---------|------------|--------|------|
|[`dockershelf/debian:stretch`](https://hub.docker.com/r/dockershelf/debian)|`stretch`|[![](https://img.shields.io/badge/-debian%2Fstretch%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&maxAge=86400&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/debian/stretch/Dockerfile)|[![](https://img.shields.io/microbadger/layers/dockershelf/debian/stretch.svg?colorA=22313f&colorB=4a637b&maxAge=86400)](https://microbadger.com/images/dockershelf/debian:stretch)|[![](https://img.shields.io/microbadger/image-size/dockershelf/debian/stretch.svg?colorA=22313f&colorB=4a637b&maxAge=86400)](https://microbadger.com/images/dockershelf/debian:stretch)|
|[`dockershelf/debian:buster`](https://hub.docker.com/r/dockershelf/debian)|`buster`|[![](https://img.shields.io/badge/-debian%2Fbuster%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&maxAge=86400&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/debian/buster/Dockerfile)|[![](https://img.shields.io/microbadger/layers/dockershelf/debian/buster.svg?colorA=22313f&colorB=4a637b&maxAge=86400)](https://microbadger.com/images/dockershelf/debian:buster)|[![](https://img.shields.io/microbadger/image-size/dockershelf/debian/buster.svg?colorA=22313f&colorB=4a637b&maxAge=86400)](https://microbadger.com/images/dockershelf/debian:buster)|
|[`dockershelf/debian:bullseye`](https://hub.docker.com/r/dockershelf/debian)|`bullseye`|[![](https://img.shields.io/badge/-debian%2Fbullseye%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&maxAge=86400&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/debian/bullseye/Dockerfile)|[![](https://img.shields.io/microbadger/layers/dockershelf/debian/bullseye.svg?colorA=22313f&colorB=4a637b&maxAge=86400)](https://microbadger.com/images/dockershelf/debian:bullseye)|[![](https://img.shields.io/microbadger/image-size/dockershelf/debian/bullseye.svg?colorA=22313f&colorB=4a637b&maxAge=86400)](https://microbadger.com/images/dockershelf/debian:bullseye)|
|[`dockershelf/debian:sid`](https://hub.docker.com/r/dockershelf/debian)|`sid`|[![](https://img.shields.io/badge/-debian%2Fsid%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&maxAge=86400&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/debian/sid/Dockerfile)|[![](https://img.shields.io/microbadger/layers/dockershelf/debian/sid.svg?colorA=22313f&colorB=4a637b&maxAge=86400)](https://microbadger.com/images/dockershelf/debian:sid)|[![](https://img.shields.io/microbadger/image-size/dockershelf/debian/sid.svg?colorA=22313f&colorB=4a637b&maxAge=86400)](https://microbadger.com/images/dockershelf/debian:sid)|
|[`dockershelf/debian:stretch`](https://hub.docker.com/r/dockershelf/debian)|`stretch`|[![](https://img.shields.io/badge/-debian%2Fstretch%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=120&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/debian/stretch/Dockerfile)|[![](https://img.shields.io/microbadger/layers/dockershelf/debian/stretch.svg?colorA=22313f&colorB=4a637b&cacheSeconds=120)](https://microbadger.com/images/dockershelf/debian:stretch)|[![](https://img.shields.io/docker/image-size/dockershelf/debian/stretch.svg?colorA=22313f&colorB=4a637b&cacheSeconds=120)](https://microbadger.com/images/dockershelf/debian:stretch)|
|[`dockershelf/debian:buster`](https://hub.docker.com/r/dockershelf/debian)|`buster`|[![](https://img.shields.io/badge/-debian%2Fbuster%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=120&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/debian/buster/Dockerfile)|[![](https://img.shields.io/microbadger/layers/dockershelf/debian/buster.svg?colorA=22313f&colorB=4a637b&cacheSeconds=120)](https://microbadger.com/images/dockershelf/debian:buster)|[![](https://img.shields.io/docker/image-size/dockershelf/debian/buster.svg?colorA=22313f&colorB=4a637b&cacheSeconds=120)](https://microbadger.com/images/dockershelf/debian:buster)|
|[`dockershelf/debian:bullseye`](https://hub.docker.com/r/dockershelf/debian)|`bullseye`|[![](https://img.shields.io/badge/-debian%2Fbullseye%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=120&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/debian/bullseye/Dockerfile)|[![](https://img.shields.io/microbadger/layers/dockershelf/debian/bullseye.svg?colorA=22313f&colorB=4a637b&cacheSeconds=120)](https://microbadger.com/images/dockershelf/debian:bullseye)|[![](https://img.shields.io/docker/image-size/dockershelf/debian/bullseye.svg?colorA=22313f&colorB=4a637b&cacheSeconds=120)](https://microbadger.com/images/dockershelf/debian:bullseye)|
|[`dockershelf/debian:sid`](https://hub.docker.com/r/dockershelf/debian)|`sid`|[![](https://img.shields.io/badge/-debian%2Fsid%2FDockerfile-blue.svg?colorA=22313f&colorB=4a637b&cacheSeconds=120&logo=docker)](https://github.com/Dockershelf/dockershelf/blob/master/debian/sid/Dockerfile)|[![](https://img.shields.io/microbadger/layers/dockershelf/debian/sid.svg?colorA=22313f&colorB=4a637b&cacheSeconds=120)](https://microbadger.com/images/dockershelf/debian:sid)|[![](https://img.shields.io/docker/image-size/dockershelf/debian/sid.svg?colorA=22313f&colorB=4a637b&cacheSeconds=120)](https://microbadger.com/images/dockershelf/debian:sid)|

![](https://rawcdn.githack.com/Dockershelf/dockershelf/42161077720b74d46b2ed8e51cb5bb958bb0406a/images/table.svg)
![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/table.svg)

## Building process

Expand Down Expand Up @@ -118,6 +118,6 @@ However, we explain the overall process here:

## Made with :heart: and :hamburger:

![Banner](https://rawcdn.githack.com/Dockershelf/dockershelf/42161077720b74d46b2ed8e51cb5bb958bb0406a/images/promo-open-source.svg)
![Banner](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/promo-open-source.svg)

> Web [collagelabs.org](http://collagelabs.org/) · GitHub [@CollageLabs](https://github.com/CollageLabs) · Twitter [@CollageLabs](https://twitter.com/CollageLabs)
6 changes: 3 additions & 3 deletions debian/README.md.template
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![](https://rawcdn.githack.com/Dockershelf/dockershelf/4db25518b4ed4507a278c56575072649fc52503a/images/banner.svg)
![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/banner.svg)

---

Expand All @@ -10,7 +10,7 @@
|-------|---------|------------|--------|------|
%%DEBIAN_TABLE%%

![](https://rawcdn.githack.com/Dockershelf/dockershelf/42161077720b74d46b2ed8e51cb5bb958bb0406a/images/table.svg)
![](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/table.svg)

## Building process

Expand Down Expand Up @@ -115,6 +115,6 @@ However, we explain the overall process here:

## Made with :heart: and :hamburger:

![Banner](https://rawcdn.githack.com/Dockershelf/dockershelf/42161077720b74d46b2ed8e51cb5bb958bb0406a/images/promo-open-source.svg)
![Banner](https://rawcdn.githack.com/Dockershelf/dockershelf/91d2963fe6771cf92350fd81b27572370381b074/images/promo-open-source.svg)

> Web [collagelabs.org](http://collagelabs.org/) · GitHub [@CollageLabs](https://github.com/CollageLabs) · Twitter [@CollageLabs](https://twitter.com/CollageLabs)
Loading

0 comments on commit 2185773

Please sign in to comment.