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

Commit 16fa60e

Browse files
jdeathejdeathe
authored
Merge pull request #62 from jdeathe/centos-7-develop
Release changes for 2.1.0
2 parents 13f31cc + 0570607 commit 16fa60e

File tree

9 files changed

+30
-24
lines changed

9 files changed

+30
-24
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44

55
Summary of release changes for Version 2.
66

7-
CentOS-7 7.4.1708 x86_64 - HAProxy 1.8 / HATop 0.7.
7+
CentOS-7 7.5.1804 x86_64 - HAProxy 1.8 / HATop 0.7.
8+
9+
### 2.1.0 - 2018-10-04
10+
11+
- Updates `haproxy18u` packages to 1.8.12-1.
12+
- Updates `rsyslog` packages to 8.24.0-16.el7_5.4.
13+
- Updates source image to [2.4.0](https://github.com/jdeathe/centos-ssh/releases/tag/2.4.0).
814

915
### 2.0.0 - 2018-07-16
1016

‎Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# =============================================================================
22
# jdeathe/centos-ssh-haproxy
33
# =============================================================================
4-
FROM jdeathe/centos-ssh:2.3.2
4+
FROM jdeathe/centos-ssh:2.4.0
55

66
ARG HATOP_VERSION="0.7.7"
77

@@ -12,8 +12,8 @@ RUN rpm --rebuilddb \
1212
&& yum -y install \
1313
--setopt=tsflags=nodocs \
1414
--disableplugin=fastestmirror \
15-
haproxy18u-1.8.9-1.ius.centos7 \
16-
rsyslog-8.24.0-16.el7 \
15+
haproxy18u-1.8.12-1.ius.centos7 \
16+
rsyslog-8.24.0-16.el7_5.4 \
1717
&& yum versionlock add \
1818
haproxy \
1919
rsyslog \
@@ -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 \
@@ -183,7 +183,7 @@ jdeathe/centos-ssh-haproxy:${RELEASE_VERSION} \
183183
org.deathe.license="MIT" \
184184
org.deathe.vendor="jdeathe" \
185185
org.deathe.url="https://github.com/jdeathe/centos-ssh-haproxy" \
186-
org.deathe.description="CentOS-7 7.4.1708 x86_64 - HAProxy 1.8 / HATop 0.7."
186+
org.deathe.description="CentOS-7 7.5.1804 x86_64 - HAProxy 1.8 / HATop 0.7."
187187

188188
HEALTHCHECK \
189189
--interval=0.5s \

‎README-short.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
CentOS-7 7.4.1708 x86_64 - HAProxy / HATop.
1+
CentOS-7 7.5.1804 x86_64 - HAProxy / HATop.

‎README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@ centos-ssh-haproxy
22
==================
33

44
Docker Image including:
5-
- CentOS-6 6.9 x86_64 - HAProxy 1.5 / HATop 0.7.
6-
- CentOS-7 7.4.1708 x86_64 - HAProxy 1.8 / HATop 0.7.
5+
- CentOS-6 6.10 x86_64 - HAProxy 1.5 / HATop 0.7.
6+
- CentOS-7 7.5.1804 x86_64 - HAProxy 1.8 / HATop 0.7.
77

88
- http://www.haproxy.org/
99
- http://feurix.org/projects/hatop/
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:

‎docker-compose-h2-proxy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030
VARNISH_MAX_THREADS: "4096"
3131
VARNISH_MIN_THREADS: "1024"
3232
VARNISH_VCL_CONF: "${VARNISH_VCL_CONF:-/run/secrets/varnish_vcl_terminated_https}"
33-
image: "jdeathe/centos-ssh-varnish:2.0.0"
33+
image: "jdeathe/centos-ssh-varnish:2.1.0"
3434
networks:
3535
- "tier2"
3636
- "tier3"
@@ -55,7 +55,7 @@ services:
5555
VARNISH_MAX_THREADS: "4096"
5656
VARNISH_MIN_THREADS: "1024"
5757
VARNISH_VCL_CONF: "${VARNISH_VCL_CONF:-/run/secrets/varnish_vcl_terminated_https}"
58-
image: "jdeathe/centos-ssh-varnish:2.0.0"
58+
image: "jdeathe/centos-ssh-varnish:2.1.0"
5959
networks:
6060
- "tier2"
6161
- "tier3"

‎docker-compose-http-proxy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030
VARNISH_MAX_THREADS: "4096"
3131
VARNISH_MIN_THREADS: "1024"
3232
VARNISH_VCL_CONF: "${VARNISH_VCL_CONF:-/run/secrets/varnish_vcl_default}"
33-
image: "jdeathe/centos-ssh-varnish:2.0.0"
33+
image: "jdeathe/centos-ssh-varnish:2.1.0"
3434
networks:
3535
- "tier2"
3636
- "tier3"
@@ -55,7 +55,7 @@ services:
5555
VARNISH_MAX_THREADS: "4096"
5656
VARNISH_MIN_THREADS: "1024"
5757
VARNISH_VCL_CONF: "${VARNISH_VCL_CONF:-/run/secrets/varnish_vcl_default}"
58-
image: "jdeathe/centos-ssh-varnish:2.0.0"
58+
image: "jdeathe/centos-ssh-varnish:2.1.0"
5959
networks:
6060
- "tier2"
6161
- "tier3"

‎docker-compose.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ services:
6666
APACHE_SERVER_NAME: "www.app.local"
6767
PHP_OPTIONS_SESSION_SAVE_HANDLER: "memcached"
6868
PHP_OPTIONS_SESSION_SAVE_PATH: "memcached:11211"
69-
image: "jdeathe/centos-ssh-apache-php:3.0.1"
69+
image: "jdeathe/centos-ssh-apache-php:3.1.0"
7070
networks:
7171
- "tier3"
7272
- "tier4"
@@ -85,7 +85,7 @@ services:
8585
APACHE_SERVER_NAME: "www.app.local"
8686
PHP_OPTIONS_SESSION_SAVE_HANDLER: "memcached"
8787
PHP_OPTIONS_SESSION_SAVE_PATH: "memcached:11211"
88-
image: "jdeathe/centos-ssh-apache-php:3.0.1"
88+
image: "jdeathe/centos-ssh-apache-php:3.1.0"
8989
networks:
9090
- "tier3"
9191
- "tier4"
@@ -95,7 +95,7 @@ services:
9595
net.ipv4.ip_local_port_range: "1024 65535"
9696
net.ipv4.route.flush: "1"
9797
memcached:
98-
image: "jdeathe/centos-ssh-memcached:2.0.0"
98+
image: "jdeathe/centos-ssh-memcached:2.1.0"
9999
environment:
100100
MEMCACHED_CACHESIZE: "32"
101101
MEMCACHED_MAXCONN: "2048"

‎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"

‎test/shpec/operation_shpec.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ function __setup ()
9494
local -r backend_name_1="apache-php.pool-1.1.1"
9595
local -r backend_name_2="apache-php.pool-1.1.2"
9696
local -r backend_network="bridge_t1"
97-
local -r backend_release="2.2.5"
97+
local -r backend_release="3.1.0"
9898

9999
# Create the bridge network
100100
if [[ -z $(docker network ls -q -f name="${backend_network}") ]]; then

0 commit comments

Comments
 (0)