Add more tags.

.travis.yml

@@ -9,25 +9,44 @@ env:
   global:
   - DOCKER_HUB_IMAGE=kudato/baseimage
   matrix:
+# pure alpine
   - FROM=alpine:latest TAGS=latest
-  - FROM=alpine:3.10 TAGS=alpine,alpine3.10
+  - FROM=alpine:3.11 TAGS=alpine,alpine3.11
+  - FROM=alpine:3.10 TAGS=alpine3.10
+# with python
   - FROM=python:3.8-alpine TAGS=python,python3.8
   - FROM=python:3.7-alpine TAGS=python,python3.7
   - FROM=python:3.6-alpine TAGS=python3.6
   - FROM=python:rc-alpine TAGS=pythonrc
+# with php
   - FROM=php:7-cli-alpine TAGS=php-cli,php7-cli
   - FROM=php:7-fpm-alpine TAGS=php-fpm,php7-fpm
   - FROM=php:5-cli-alpine TAGS=php5-cli
   - FROM=php:5-fpm-alpine TAGS=php5-fpm
+# with node
   - FROM=node:6-alpine TAGS=node6
   - FROM=node:8-alpine TAGS=node8
   - FROM=node:10-alpine TAGS=node10
   - FROM=node:12-alpine TAGS=node12
+# docker in docker
   - FROM=docker:latest TAGS=docker
-  - FROM=nginx:alpine TAGS=nginx
-  - FROM=nginx:stable-alpine TAGS=stable
+# nginx
+  - FROM=nginx:alpine TAGS=nginx,nginx-mainline
+  - FROM=nginx:stable-alpine TAGS=nginx-stable
+# hashicorp vault
+  - FROM=vault:latest TAGS=vault
+  - FROM=vault:1.3.1 TAGS=vault1.3.1
+# traefik
+  - FROM=traefik:1.7-alpine TAGS=traefik1,traefik1.7
+  - FROM=traefik:2.1 TAGS=traefik2,traefik2.1
+# postrgesql
+  - FROM=postgres:12-alpine TAGS=postgres,postgres12
+  - FROM=postgres:11-alpine TAGS=postgres11
+  - FROM=postgres:10-alpine TAGS=postgres10
+  - FROM=postgres:9.6-alpine TAGS=postgres9.6
 
-script:
+
+  script:
 - echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin &>/dev/null
 - chmod +x ./build.sh; ./build.sh
 

README.md

@@ -1,20 +1,31 @@
-# [baseimage](https://github.com/kudato/baseimage/blob/master/Dockerfile) [![Build Status](https://travis-ci.org/kudato/baseimage.svg?branch=master)](https://travis-ci.org/kudato/baseimage)
-
-
-```ENTRYPOINT``` with [tini](https://github.com/krallin/tini) and [su-exec](https://github.com/ncopa/su-exec) to run as user, ```INIT_SCRIPT``` for custom init script, some healthchecks types and more.
-
-
-| Tags                             | FROM             |                              |
-| -------------------------------- | ---------------- | -------------------------------- |
-| ```latest``` | [```alpine:latest```](https://hub.docker.com/_/alpine) | [![](https://images.microbadger.com/badges/image/kudato/baseimage.svg)](https://microbadger.com/images/kudato/baseimage) |
-| ```alpine```, ```alpine3.10``` | [```alpine:3.10```](https://hub.docker.com/_/alpine)  | [![](https://images.microbadger.com/badges/image/kudato/baseimage:alpine.svg)](https://microbadger.com/images/kudato/baseimage:alpine) |
-| ```python```, ```python3.7``` | [```pyhton:3.7-alpine```](https://hub.docker.com/_/python) | [![](https://images.microbadger.com/badges/image/kudato/baseimage:python.svg)](https://microbadger.com/images/kudato/baseimage:python) |
-| ```python3.6``` | [```pyhton:3.6-alpine```](https://hub.docker.com/_/python) | [![](https://images.microbadger.com/badges/image/kudato/baseimage:python.svg)](https://microbadger.com/images/kudato/baseimage:python3.6) |
-| ```php-cli```, ```php7-cli``` | [```php:7-cli-alpine```](https://hub.docker.com/_/php) | [![](https://images.microbadger.com/badges/image/kudato/baseimage:php-cli.svg)](https://microbadger.com/images/kudato/baseimage:php-cli) |
-| ```php-fpm```, ```php7-fpm``` | [```php:7-fpm-alpine```](https://hub.docker.com/_/php) | [![](https://images.microbadger.com/badges/image/kudato/baseimage:php-fpm.svg)](https://microbadger.com/images/kudato/baseimage:php-fpm) |
-| ```php5-cli``` | [```php:5-cli-alpine```](https://hub.docker.com/_/php) | [![](https://images.microbadger.com/badges/image/kudato/baseimage:php5-cli.svg)](https://microbadger.com/images/kudato/baseimage:php5-cli) |
-| ```php5-fpm``` | [```php:5-fpm-alpine```](https://hub.docker.com/_/php) | [![](https://images.microbadger.com/badges/image/kudato/baseimage:php5-fpm.svg)](https://microbadger.com/images/kudato/baseimage:php5-fpm) |
-| ```node6``` | [```node:6-alpine```](https://hub.docker.com/_/node/) | [![](https://images.microbadger.com/badges/image/kudato/baseimage:node6.svg)](https://microbadger.com/images/kudato/baseimage:node6) |
-| ```node8``` | [```node:8-alpine```](https://hub.docker.com/_/node/) | [![](https://images.microbadger.com/badges/image/kudato/baseimage:node8.svg)](https://microbadger.com/images/kudato/baseimage:node8) |
-| ```docker``` | [```docker:latest```](https://hub.docker.com/_/docker) | [![](https://images.microbadger.com/badges/image/kudato/baseimage:docker.svg)](https://microbadger.com/images/kudato/baseimage:docker) |
-| ```nginx``` | [```nginx:alpine```](https://hub.docker.com/_/docker) | [![](https://images.microbadger.com/badges/image/kudato/baseimage:nginx.svg)](https://microbadger.com/images/kudato/baseimage:nginx) |
+# baseimage [![Build Status](https://travis-ci.org/kudato/baseimage.svg?branch=master)](https://travis-ci.org/kudato/baseimage)
+
+[Alpine](https://alpinelinux.org)-based base image and ```entrypoint.sh``` script with [tini](https://github.com/krallin/tini) and [su-exec](https://github.com/ncopa/su-exec).
+
+# Usage
+
+```Dockerfile
+FROM kudato/baseimage:alpine
+
+RUN apk add ...
+COPY myscript.sh .
+
+CMD [ "myscript.sh" ]
+```
+
+# Supported tags
+
+See on [Docker Hub page.](https://hub.docker.com/repository/docker/kudato/baseimage)
+
+# Environment variables
+
+ - ```TZ``` - set timezone(default ```UTC```);
+ - ```CMD_USER``` - specify user(default ```root```);
+ - ```CMD_USER_UID``` - specify user uid;
+ - ```USER_SHELL``` - specify user;
+ - ```[...]_INIT_SCRIPT=path_to_file``` - run script before main command, to run multiple scripts, create variables with unique names for each.
+
+# Tests
+
+ - Install docker and docker-compose;
+ - ```export FROM=alpine:latest``` and ```docker-compose up --build```.