From ae1fed3eef44b6713e31059c5b1910b9e4784e6a Mon Sep 17 00:00:00 2001
From: Luis Miguel Vicente Fuentes <kijart@gmail.com>
Date: Sat, 12 Sep 2020 14:07:59 +0200
Subject: [PATCH 1/4] Update README format and some docker params

---
 README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 7022025..a3c8059 100644
--- a/README.md
+++ b/README.md
@@ -6,27 +6,27 @@ Run Monit inside docker.
 
 [Monit](https://mmonit.com/monit/) is a free open source utility for managing and monitoring, processes, programs, files, directories and filesystems on a UNIX system. Monit conducts automatic maintenance and repair and can execute meaningful causal actions in error situations.
 
-Default username/password: admin/monit
+Default username/password: `admin/monit`
 
 ## Docker setup
 
-Install docker: https://docs.docker.com/engine/installation/
+Install docker: <https://docs.docker.com/engine/installation/>
 
-Install docker compose: https://docs.docker.com/compose/install/
+Install docker compose: <https://docs.docker.com/compose/install/>
 
-Docker documentation: https://docs.docker.com/
+Docker documentation: <https://docs.docker.com/>
 
 ### Build-in docker image
 
 - build docker image `docker build -t monit .`
 
-- start monit: `docker run -ti -p 2812:2812 -v $(pwd)/monitrc:/etc/monitrc monit`
+- start monit: `docker run --rm -it -p 2812:2812 -v $(pwd)/monitrc:/etc/monitrc monit`
 
 ### Docker Hub image
 
-- pull docker image from docker hub: `docker pull kijart/monit`
+- pull docker image from docker hub: `docker pull kijart/monit:latest`
 
-- start monit: `docker run -ti -p 2812:2812 -v $(pwd)/monitrc:/etc/monitrc kijart/monit`
+- start monit: `docker run --rm -it -p 2812:2812 -v $(pwd)/monitrc:/etc/monitrc kijart/monit:latest`
 
 - create a docker container:
 
@@ -35,7 +35,7 @@ docker create \
   --name=monit \
   -p 2812:2812 \
   -v $(pwd)/monitrc:/etc/monitrc \
-  kijart/monit
+  kijart/monit:latest
 ```
 
 ### Docker compose

From a7fda674bebb4f4b85ce9e9cf545ede222915972 Mon Sep 17 00:00:00 2001
From: Luis Miguel Vicente Fuentes <kijart@gmail.com>
Date: Sat, 12 Sep 2020 14:08:44 +0200
Subject: [PATCH 2/4] Add explicit image latest tag in docker-compose config
 file

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d2c6df2..f8b2b9c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "2"
 services:
   monit:
-    image: "kijart/monit"
+    image: kijart/monit:latest
     logging:
       driver: json-file
       options:

From bb337803a84a80663ee372e1856d86166d9b57d6 Mon Sep 17 00:00:00 2001
From: Luis Miguel Vicente Fuentes <kijart@gmail.com>
Date: Sat, 12 Sep 2020 14:09:57 +0200
Subject: [PATCH 3/4] Add versions section in README

---
 README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index a3c8059..02431c8 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,17 @@ Run Monit inside docker.
 
 Default username/password: `admin/monit`
 
+## Versions
+
+| Docker image           | Monit     |
+| ---------------------- | --------- |
+| `kijart/monit:latest`  | `5.26.0`  |
+| `kijart/monit:1.2.0`   | `5.26.0`  |
+| `kijart/monit:1.1.0`   | `5.25.2`  |
+| `kijart/monit:1.0.2`   | `5.25.1`  |
+| `kijart/monit:1.0.1`   | `5.25.1`  |
+| `kijart/monit:1.0.0`   | `5.25.1`  |
+
 ## Docker setup
 
 Install docker: <https://docs.docker.com/engine/installation/>

From 8d8278fdb3ff8a3d0528a48fb888a7ac3acf8f36 Mon Sep 17 00:00:00 2001
From: Luis Miguel Vicente Fuentes <kijart@gmail.com>
Date: Sat, 12 Sep 2020 14:10:49 +0200
Subject: [PATCH 4/4] Add Docker cloud build status badge

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 02431c8..6c6312d 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/kijart/monit.svg)](https://hub.docker.com/r/kijart/monit)
+
 # Monit - UNIX Systems Management
 
 Run Monit inside docker.