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

Commit 0570607

Browse files
committed
Release changes for 1.1.0/2.1.0.
1 parent 47b229b commit 0570607

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
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.1.0 - Unreleased
9+
### 2.1.0 - 2018-10-04
1010

1111
- Updates `haproxy18u` packages to 1.8.12-1.
1212
- Updates `rsyslog` packages to 8.24.0-16.el7_5.4.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ ENV HAPROXY_SSL_CERTIFICATE="" \
156156
# -----------------------------------------------------------------------------
157157
# Set image metadata
158158
# -----------------------------------------------------------------------------
159-
ARG RELEASE_VERSION="2.0.0"
159+
ARG RELEASE_VERSION="2.1.0"
160160
LABEL \
161161
maintainer="James Deathe <[email protected]>" \
162162
install="docker run \

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.0.0`, `2.0.0` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-7/Dockerfile)
14-
- `centos-6`, `centos-6-1.0.3`, `1.0.3` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-6/Dockerfile)
13+
- `centos-7`, `centos-7-2.1.0`, `2.1.0` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-7/Dockerfile)
14+
- `centos-6`, `centos-6-1.1.0`, `1.1.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.0.3`or `1.0.3` for the [1.0.3](https://github.com/jdeathe/centos-ssh-haproxy/tree/1.0.3) 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.1.0`or `1.1.0` for the [1.1.0](https://github.com/jdeathe/centos-ssh-haproxy/tree/1.1.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.0.0`or `2.0.0` for the [2.0.0](https://github.com/jdeathe/centos-ssh-haproxy/tree/2.0.0) 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.1.0`or `2.1.0` for the [2.1.0](https://github.com/jdeathe/centos-ssh-haproxy/tree/2.1.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.0.0
51+
jdeathe/centos-ssh-haproxy:2.1.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.0.0
88+
jdeathe/centos-ssh-haproxy:2.1.0
8989
```
9090

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

src/etc/systemd/system/[email protected]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Environment="DOCKER_USER=jdeathe"
5252
Environment="DOCKER_CONTAINER_OPTS="
5353
Environment="DOCKER_IMAGE_PACKAGE_PATH=/var/opt/scmi/packages"
5454
Environment="DOCKER_IMAGE_NAME=centos-ssh-haproxy"
55-
Environment="DOCKER_IMAGE_TAG=2.0.0"
55+
Environment="DOCKER_IMAGE_TAG=2.1.0"
5656
Environment="DOCKER_PORT_MAP_TCP_80=8000"
5757
Environment="DOCKER_PORT_MAP_TCP_443=8500"
5858
Environment="ULIMIT_MEMLOCK=82000"

0 commit comments

Comments
 (0)