Skip to content
This repository was archived by the owner on Jul 2, 2024. It is now read-only.

Commit 5b4daaa

Browse files
committed
Release changes for 1.2.0 and 2.2.0.
1 parent 66303a7 commit 5b4daaa

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Summary of release changes for Version 2.
66

77
CentOS-7 7.5.1804 x86_64 - HAProxy 1.8 / HATop 0.7.
88

9-
### 2.2.0 - Unreleased
9+
### 2.2.0 - 2019-05-30
1010

1111
- Updates `haproxy18u` packages to 1.8.19-1.
1212
- Updates source image to [2.5.1](https://github.com/jdeathe/centos-ssh/releases/tag/2.5.1).

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM jdeathe/centos-ssh:2.5.1
22

33
ARG HATOP_VERSION="0.7.7"
4-
ARG RELEASE_VERSION="2.1.1"
4+
ARG RELEASE_VERSION="2.2.0"
55

66
# ------------------------------------------------------------------------------
77
# Base install of required packages

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ Docker Image including:
1010

1111
## Overview & links
1212

13-
- `centos-7`, `centos-7-2.1.1`, `2.1.1` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-7/Dockerfile)
14-
- `centos-6`, `centos-6-1.1.1`, `1.1.1` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-6/Dockerfile)
13+
- `centos-7`, `centos-7-2.2.0`, `2.2.0` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-7/Dockerfile)
14+
- `centos-6`, `centos-6-1.2.0`, `1.2.0` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-6/Dockerfile)
1515

1616
#### centos-6
1717

18-
The latest CentOS-6 based release can be pulled from the `centos-6` Docker tag. It is recommended to select a specific release tag - the convention is `centos-6-1.1.1`or `1.1.1` for the [1.1.1](https://github.com/jdeathe/centos-ssh-haproxy/tree/1.1.1) release tag.
18+
The latest CentOS-6 based release can be pulled from the `centos-6` Docker tag. It is recommended to select a specific release tag - the convention is `centos-6-1.2.0`or `1.2.0` for the [1.2.0](https://github.com/jdeathe/centos-ssh-haproxy/tree/1.2.0) release tag.
1919

2020
#### centos-7
2121

22-
The latest CentOS-7 based release can be pulled from the `centos-7` Docker tag. It is recommended to select a specific release tag - the convention is `centos-7-2.1.1`or `2.1.1` for the [2.1.1](https://github.com/jdeathe/centos-ssh-haproxy/tree/2.1.1) release tag.
22+
The latest CentOS-7 based release can be pulled from the `centos-7` Docker tag. It is recommended to select a specific release tag - the convention is `centos-7-2.2.0`or `2.2.0` for the [2.2.0](https://github.com/jdeathe/centos-ssh-haproxy/tree/2.2.0) release tag.
2323

2424
Included in the build are the [SCL](https://www.softwarecollections.org/), [EPEL](http://fedoraproject.org/wiki/EPEL) and [IUS](https://ius.io) repositories. Installed packages include [OpenSSH](http://www.openssh.com/portable.html) secure shell, [vim-minimal](http://www.vim.org/), are installed along with python-setuptools, [supervisor](http://supervisord.org/) and [supervisor-stdout](https://github.com/coderanger/supervisor-stdout).
2525

@@ -48,7 +48,7 @@ $ docker run -d -t \
4848
-p 443:443 \
4949
--add-host httpd_1:172.17.8.101 \
5050
--add-host httpd_2:172.17.8.102 \
51-
jdeathe/centos-ssh-haproxy:2.1.1
51+
jdeathe/centos-ssh-haproxy:2.2.0
5252
```
5353

5454
Now you can verify it is initialised and running successfully by inspecting the container's logs.
@@ -85,7 +85,7 @@ $ docker run \
8585
--env "HAPROXY_HOST_NAMES=www.app.local app.local localhost.localdomain" \
8686
--add-host httpd_1:172.17.8.101 \
8787
--add-host httpd_2:172.17.8.102 \
88-
jdeathe/centos-ssh-haproxy:2.1.1
88+
jdeathe/centos-ssh-haproxy:2.2.0
8989
```
9090

9191
Now you can verify it is initialised and running successfully by inspecting the container's logs:

0 commit comments

Comments
 (0)