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

Commit 03e287b

Browse files
jdeathejdeathe
authored
Merge pull request #83 from jdeathe/centos-6-develop
Release changes for 1.1.1
2 parents ceb13e5 + f2ca39d commit 03e287b

17 files changed

+129
-91
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ Summary of release changes for Version 1.
66

77
CentOS-6 6.10 x86_64 - HAProxy 1.5 / HATop 0.7.
88

9+
### 1.1.1 - 2018-12-27
10+
11+
- Updates source image to [1.9.1](https://github.com/jdeathe/centos-ssh/releases/tag/1.9.1).
12+
- Updates image versions in tests and docker-compose examples.
13+
- Updates and normalises scripts for readability.
14+
- Adds required `--sysctl` settings to docker run templates.
15+
- Fixes example docker-compose Setup instructions.
16+
917
### 1.1.0 - 2018-10-04
1018

1119
- Updates source image to [1.9.0](https://github.com/jdeathe/centos-ssh/releases/tag/1.9.0).

‎Dockerfile‎

Lines changed: 2 additions & 2 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:1.9.0
4+
FROM jdeathe/centos-ssh:1.9.1
55

66
ARG HATOP_VERSION="0.7.7"
77

@@ -150,7 +150,7 @@ ENV HAPROXY_SSL_CERTIFICATE="" \
150150
# -----------------------------------------------------------------------------
151151
# Set image metadata
152152
# -----------------------------------------------------------------------------
153-
ARG RELEASE_VERSION="1.1.0"
153+
ARG RELEASE_VERSION="1.1.1"
154154
LABEL \
155155
maintainer="James Deathe <[email protected]>" \
156156
install="docker run \

‎README.md‎

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

88
## Overview & links
99

10-
- `centos-7`, `centos-7-2.1.0`, `2.1.0` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-7/Dockerfile)
11-
- `centos-6`, `centos-6-1.1.0`, `1.1.0` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-6/Dockerfile)
10+
- `centos-7`, `centos-7-2.1.1`, `2.1.1` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-7/Dockerfile)
11+
- `centos-6`, `centos-6-1.1.1`, `1.1.1` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-6/Dockerfile)
1212

1313
#### centos-6
1414

15-
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.
15+
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.
1616

1717
#### centos-7
1818

19-
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.
19+
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.
2020

2121
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).
2222

@@ -45,7 +45,7 @@ $ docker run -d -t \
4545
-p 443:443 \
4646
--add-host httpd_1:172.17.8.101 \
4747
--add-host httpd_2:172.17.8.102 \
48-
jdeathe/centos-ssh-haproxy:1.1.0
48+
jdeathe/centos-ssh-haproxy:1.1.1
4949
```
5050

5151
Now you can verify it is initialised and running successfully by inspecting the container's logs.
@@ -82,7 +82,7 @@ $ docker run \
8282
--env "HAPROXY_HOST_NAMES=www.app.local app.local localhost.localdomain" \
8383
--add-host httpd_1:172.17.8.101 \
8484
--add-host httpd_2:172.17.8.102 \
85-
jdeathe/centos-ssh-haproxy:1.1.0
85+
jdeathe/centos-ssh-haproxy:1.1.1
8686
```
8787

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

‎default.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Common parameters of create and run targets
33
define DOCKER_CONTAINER_PARAMETERS
44
--tty \
5-
--sysctl "net.core.somaxconn=32768" \
6-
--sysctl "net.ipv4.ip_local_port_range=1024 65535" \
7-
--sysctl "net.ipv4.route.flush=1" \
5+
--sysctl "net.core.somaxconn=$(SYSCTL_NET_CORE_SOMAXCONN)" \
6+
--sysctl "net.ipv4.ip_local_port_range=$(SYSCTL_NET_IPV4_IP_LOCAL_PORT_RANGE)" \
7+
--sysctl "net.ipv4.route.flush=$(SYSCTL_NET_IPV4_ROUTE_FLUSH)" \
88
--ulimit memlock=$(ULIMIT_MEMLOCK) \
99
--ulimit nofile=$(ULIMIT_NOFILE) \
1010
--ulimit nproc=$(ULIMIT_NPROC) \

‎docker-compose-http-proxy.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Ref: https://docs.docker.com/compose/compose-file/
33
#
44
# Setup:
5-
# docker-compose down
6-
# docker-compose build
5+
# docker-compose -f docker-compose.yml -f docker-compose-http-proxy.yml build
6+
# docker-compose -f docker-compose.yml -f docker-compose-http-proxy.yml down
77
#
88
# Run HTTP/1.1 PROXY (Varnish) example:
99
# docker-compose -f docker-compose.yml -f docker-compose-http-proxy.yml up -d
@@ -27,10 +27,10 @@ services:
2727
varnish_1:
2828
environment:
2929
VARNISH_STORAGE: "malloc,256M"
30-
VARNISH_MAX_THREADS: "4096"
31-
VARNISH_MIN_THREADS: "1024"
30+
VARNISH_MAX_THREADS: "2000"
31+
VARNISH_MIN_THREADS: "200"
3232
VARNISH_VCL_CONF: "${VARNISH_VCL_CONF:-/var/run/secrets/varnish_vcl_default}"
33-
image: "jdeathe/centos-ssh-varnish:2.1.0"
33+
image: "jdeathe/centos-ssh-varnish:1.5.2"
3434
networks:
3535
- "tier2"
3636
- "tier3"
@@ -52,10 +52,10 @@ services:
5252
varnish_2:
5353
environment:
5454
VARNISH_STORAGE: "malloc,256M"
55-
VARNISH_MAX_THREADS: "4096"
56-
VARNISH_MIN_THREADS: "1024"
55+
VARNISH_MAX_THREADS: "2000"
56+
VARNISH_MIN_THREADS: "200"
5757
VARNISH_VCL_CONF: "${VARNISH_VCL_CONF:-/var/run/secrets/varnish_vcl_default}"
58-
image: "jdeathe/centos-ssh-varnish:2.1.0"
58+
image: "jdeathe/centos-ssh-varnish:1.5.2"
5959
networks:
6060
- "tier2"
6161
- "tier3"

‎docker-compose-tcp.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Ref: https://docs.docker.com/compose/compose-file/
33
#
44
# Setup:
5-
# docker-compose down
6-
# docker-compose build
5+
# docker-compose -f docker-compose.yml -f docker-compose-tcp.yml build
6+
# docker-compose -f docker-compose.yml -f docker-compose-tcp.yml down
77
#
88
# Run TCP example:
99
# docker-compose -f docker-compose.yml -f docker-compose-tcp.yml up -d

‎docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Ref: https://docs.docker.com/compose/compose-file/
33
#
44
# Setup:
5-
# docker-compose down
65
# docker-compose build
6+
# docker-compose down
77
#
88
# Run Default example:
99
# docker-compose up -d
@@ -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:2.3.0"
69+
image: "jdeathe/centos-ssh-apache-php:2.3.1"
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:2.3.0"
88+
image: "jdeathe/centos-ssh-apache-php:2.3.1"
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:1.2.0"
98+
image: "jdeathe/centos-ssh-memcached:1.2.1"
9999
environment:
100100
MEMCACHED_CACHESIZE: "32"
101101
MEMCACHED_MAXCONN: "2048"

‎environment.mk‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ DIST_PATH ?= ./dist
3131
# Number of seconds expected to complete container startup including bootstrap.
3232
STARTUP_TIME ?= 2
3333

34+
# Docker --sysctl settings
35+
SYSCTL_NET_CORE_SOMAXCONN ?= 32768
36+
SYSCTL_NET_IPV4_IP_LOCAL_PORT_RANGE ?= 1024 65535
37+
SYSCTL_NET_IPV4_ROUTE_FLUSH ?= 1
38+
3439
# Docker --ulimit settings
3540
ULIMIT_MEMLOCK ?= 82000
3641
ULIMIT_NOFILE ?= 131072

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,12 @@ 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=1.1.0"
55+
Environment="DOCKER_IMAGE_TAG=1.1.1"
5656
Environment="DOCKER_PORT_MAP_TCP_80=8000"
5757
Environment="DOCKER_PORT_MAP_TCP_443=8500"
58+
Environment="SYSCTL_NET_CORE_SOMAXCONN=32768"
59+
Environment="SYSCTL_NET_IPV4_IP_LOCAL_PORT_RANGE=1024 65535"
60+
Environment="SYSCTL_NET_IPV4_ROUTE_FLUSH=1"
5861
Environment="ULIMIT_MEMLOCK=82000"
5962
Environment="ULIMIT_NOFILE=131072"
6063
Environment="ULIMIT_NPROC=9223372036854775807"
@@ -91,12 +94,12 @@ ExecStart=/bin/bash -c \
9194
"exec /usr/bin/docker run \
9295
-t \
9396
--name %p.%i \
94-
--sysctl \"net.core.somaxconn=32768\" \
95-
--sysctl \"net.ipv4.ip_local_port_range=1024 65535\" \
96-
--sysctl \"net.ipv4.route.flush=1\" \
97-
--ulimit memlock=${ULIMIT_MEMLOCK} \
98-
--ulimit nofile=${ULIMIT_NOFILE} \
99-
--ulimit nproc=${ULIMIT_NPROC} \
97+
--sysctl \"net.core.somaxconn=${SYSCTL_NET_CORE_SOMAXCONN}\" \
98+
--sysctl \"net.ipv4.ip_local_port_range=${SYSCTL_NET_IPV4_IP_LOCAL_PORT_RANGE}\" \
99+
--sysctl \"net.ipv4.route.flush=${SYSCTL_NET_IPV4_ROUTE_FLUSH}\" \
100+
--ulimit \"memlock=${ULIMIT_MEMLOCK}\" \
101+
--ulimit \"nofile=${ULIMIT_NOFILE}\" \
102+
--ulimit \"nproc=${ULIMIT_NPROC}\" \
100103
--env \"HAPROXY_SSL_CERTIFICATE=${HAPROXY_SSL_CERTIFICATE}\" \
101104
--env \"HAPROXY_CONFIG=${HAPROXY_CONFIG}\" \
102105
--env \"HAPROXY_HOST_NAMES=${HAPROXY_HOST_NAMES}\" \

‎src/opt/scmi/default.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ fi
4141
DOCKER_CONTAINER_PARAMETERS="--tty \
4242
--name ${DOCKER_NAME} \
4343
--restart ${DOCKER_RESTART_POLICY} \
44-
--sysctl \"net.core.somaxconn=32768\" \
45-
--sysctl \"net.ipv4.ip_local_port_range=1024 65535\" \
46-
--sysctl \"net.ipv4.route.flush=1\" \
47-
--ulimit memlock=${ULIMIT_MEMLOCK} \
48-
--ulimit nofile=${ULIMIT_NOFILE} \
49-
--ulimit nproc=${ULIMIT_NPROC} \
44+
--sysctl \"net.core.somaxconn=${SYSCTL_NET_CORE_SOMAXCONN}\" \
45+
--sysctl \"net.ipv4.ip_local_port_range=${SYSCTL_NET_IPV4_IP_LOCAL_PORT_RANGE}\" \
46+
--sysctl \"net.ipv4.route.flush=${SYSCTL_NET_IPV4_ROUTE_FLUSH}\" \
47+
--ulimit \"memlock=${ULIMIT_MEMLOCK}\" \
48+
--ulimit \"nofile=${ULIMIT_NOFILE}\" \
49+
--ulimit \"nproc=${ULIMIT_NPROC}\" \
5050
--env \"HAPROXY_SSL_CERTIFICATE=${HAPROXY_SSL_CERTIFICATE}\" \
5151
--env \"HAPROXY_CONFIG=${HAPROXY_CONFIG}\" \
5252
--env \"HAPROXY_HOST_NAMES=${HAPROXY_HOST_NAMES}\" \

0 commit comments

Comments
 (0)