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

Release changes for 1.9.1 #201

Merged
merged 6 commits into from
Nov 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ Summary of release changes for Version 1.

CentOS-6 6.10 x86_64 - MySQL 5.1.

### 1.9.1 - Unreleased
### 1.9.1 - 2018-11-18

- Updates source image to [1.9.1](https://github.com/jdeathe/centos-ssh/releases/tag/1.9.1).
- Adds missing error messages to internal healthcheck.

### 1.9.0 - 2018-08-23

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ ENV MYSQL_AUTOSTART_MYSQLD_BOOTSTRAP=true \
# -----------------------------------------------------------------------------
# Set image metadata
# -----------------------------------------------------------------------------
ARG RELEASE_VERSION="1.9.0"
ARG RELEASE_VERSION="1.9.1"
LABEL \
maintainer="James Deathe <james.deathe@gmail.com>" \
install="docker run \
Expand Down
36 changes: 18 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ Includes Automated password generation and an option for custom initialisation S

## Overview & links

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

### Tags and respective `Dockerfile` links

- `centos-7-mysql57-community`, `centos-7-mysql57-community-2.1.0`, `2.1.0` [(centos-7-mysql57-community/Dockerfile)](https://github.com/jdeathe/centos-ssh-mysql/blob/centos-7-mysql57-community/Dockerfile)
- `centos-6`, `centos-6-1.9.0`, `1.9.0` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-mysql/blob/centos-6/Dockerfile)
- `centos-7-mysql57-community`, `centos-7-mysql57-community-2.1.1`, `2.1.1` [(centos-7-mysql57-community/Dockerfile)](https://github.com/jdeathe/centos-ssh-mysql/blob/centos-7-mysql57-community/Dockerfile)
- `centos-6`, `centos-6-1.9.1`, `1.9.1` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-mysql/blob/centos-6/Dockerfile)

The Dockerfile can be used to build a base image that is the bases for several other docker images.

Expand Down Expand Up @@ -43,7 +43,7 @@ $ docker run -d \
--name mysql.pool-1.1.1 \
-p 3306:3306 \
-v /var/lib/mysql \
jdeathe/centos-ssh-mysql:1.9.0
jdeathe/centos-ssh-mysql:1.9.1
```

Now you can verify it is initialised and running successfully by inspecting the container's logs.
Expand Down Expand Up @@ -114,10 +114,10 @@ $ docker run \
--rm \
--privileged \
--volume /:/media/root \
jdeathe/centos-ssh-mysql:1.9.0 \
jdeathe/centos-ssh-mysql:1.9.1 \
/usr/sbin/scmi install \
--chroot=/media/root \
--tag=1.9.0 \
--tag=1.9.1 \
--name=mysql.pool-1.1.1 \
--setopt='--volume {{NAME}}.data-mysql:/var/lib/mysql'
```
Expand All @@ -131,10 +131,10 @@ $ docker run \
--rm \
--privileged \
--volume /:/media/root \
jdeathe/centos-ssh-mysql:1.9.0 \
jdeathe/centos-ssh-mysql:1.9.1 \
/usr/sbin/scmi uninstall \
--chroot=/media/root \
--tag=1.9.0 \
--tag=1.9.1 \
--name=mysql.pool-1.1.1 \
--setopt='--volume {{NAME}}.data-mysql:/var/lib/mysql'
```
Expand All @@ -148,10 +148,10 @@ $ docker run \
--rm \
--privileged \
--volume /:/media/root \
jdeathe/centos-ssh-mysql:1.9.0 \
jdeathe/centos-ssh-mysql:1.9.1 \
/usr/sbin/scmi install \
--chroot=/media/root \
--tag=1.9.0 \
--tag=1.9.1 \
--name=mysql.pool-1.1.1 \
--manager=systemd \
--register \
Expand All @@ -178,7 +178,7 @@ To see detailed information about the image run `scmi` with the `--info` option.
$ eval "sudo -E $(
docker inspect \
-f "{{.ContainerConfig.Labels.install}}" \
jdeathe/centos-ssh-mysql:1.9.0
jdeathe/centos-ssh-mysql:1.9.1
) --info"
```

Expand All @@ -188,7 +188,7 @@ To perform an installation using the docker name `mysql.pool-1.2.1` simply use t
$ eval "sudo -E $(
docker inspect \
-f "{{.ContainerConfig.Labels.install}}" \
jdeathe/centos-ssh-mysql:1.9.0
jdeathe/centos-ssh-mysql:1.9.1
) --name=mysql.pool-1.2.1"
```

Expand All @@ -198,7 +198,7 @@ To uninstall use the *same command* that was used to install but with the `unins
$ eval "sudo -E $(
docker inspect \
-f "{{.ContainerConfig.Labels.uninstall}}" \
jdeathe/centos-ssh-mysql:1.9.0
jdeathe/centos-ssh-mysql:1.9.1
) --name=mysql.pool-1.2.1"
```

Expand All @@ -211,7 +211,7 @@ To see detailed information about the image run `scmi` with the `--info` option.
```
$ sudo -E atomic install \
-n mysql.pool-1.3.1 \
jdeathe/centos-ssh-mysql:1.9.0 \
jdeathe/centos-ssh-mysql:1.9.1 \
--info
```

Expand All @@ -220,14 +220,14 @@ To perform an installation using the docker name `mysql.pool-1.3.1` simply use t
```
$ sudo -E atomic install \
-n mysql.pool-1.3.1 \
jdeathe/centos-ssh-mysql:1.9.0
jdeathe/centos-ssh-mysql:1.9.1
```

Alternatively, you could use the `scmi` options `--name` or `-n` for naming the container.

```
$ sudo -E atomic install \
jdeathe/centos-ssh-mysql:1.9.0 \
jdeathe/centos-ssh-mysql:1.9.1 \
--name mysql.pool-1.3.1
```

Expand All @@ -236,7 +236,7 @@ To uninstall use the *same command* that was used to install but with the `unins
```
$ sudo -E atomic uninstall \
-n mysql.pool-1.3.1 \
jdeathe/centos-ssh-mysql:1.9.0
jdeathe/centos-ssh-mysql:1.9.1
```

#### Using environment variables
Expand All @@ -255,7 +255,7 @@ $ docker run \
--env "MYSQL_USER_PASSWORD=" \
--env "MYSQL_USER_DATABASE=app-db" \
--volume mysql.pool-1.1.1.data-mysql:/var/lib/mysql \
jdeathe/centos-ssh-mysql:1.9.0
jdeathe/centos-ssh-mysql:1.9.1
```

The environmental variable `MYSQL_SUBNET` is optional but can be used to generate users with access to databases outside the `localhost`, (the default for the root user). In the example, the subnet definition `0.0.0.0/0.0.0.0` allows connections from any network which is equivalent to the wildcard symbol, `%`, in MySQL GRANT definitions.
Expand Down
2 changes: 1 addition & 1 deletion src/etc/systemd/system/centos-ssh-mysql@.service
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Environment="DOCKER_USER=jdeathe"
Environment="DOCKER_IMAGE_NAME=centos-ssh-mysql"
Environment="DOCKER_CONTAINER_OPTS="
Environment="DOCKER_IMAGE_PACKAGE_PATH=/var/opt/scmi/packages"
Environment="DOCKER_IMAGE_TAG=1.9.0"
Environment="DOCKER_IMAGE_TAG=1.9.1"
Environment="DOCKER_PORT_MAP_TCP_3306=3306"
Environment="MYSQL_AUTOSTART_MYSQLD_BOOTSTRAP=true"
Environment="MYSQL_AUTOSTART_MYSQLD_WRAPPER=true"
Expand Down
6 changes: 6 additions & 0 deletions src/usr/bin/healthcheck
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,9 @@ function main ()
if [[ -e /var/lock/subsys/mysqld-bootstrap ]] \
|| ! __is_mysql_data_directory_populated
then
__print_message \
"error" \
"Bootstrap failed to complete."
exit 1
fi
fi
Expand All @@ -242,6 +245,9 @@ function main ()
if ! ps axo command \
| grep -qE '^/usr/libexec/mysqld '
then
__print_message \
"error" \
"Service process not running."
exit 1
fi

Expand Down