diff --git a/CHANGELOG.md b/CHANGELOG.md index 12e0cf9..e5f4db2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ Summary of release changes for Version 1 - CentOS-6 -### 1.8.4 - Unreleased +### 1.8.4 - 2018-04-24 - Updates supervisor to 3.3.4. - Adds feature to set `SSH_USER_PASSWORD` via a file path. e.g. Docker Swarm secrets. diff --git a/Dockerfile b/Dockerfile index 9227707..b3ea511 100644 --- a/Dockerfile +++ b/Dockerfile @@ -164,7 +164,7 @@ ENV SSH_AUTHORIZED_KEYS="" \ # ----------------------------------------------------------------------------- # Set image metadata # ----------------------------------------------------------------------------- -ARG RELEASE_VERSION="1.8.3" +ARG RELEASE_VERSION="1.8.4" LABEL \ maintainer="James Deathe " \ install="docker run \ diff --git a/README.md b/README.md index 4fc56b3..d17d6f4 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,12 @@ Includes public key authentication, Automated password generation and supports c ## Overview & links -The latest CentOS-6 / CentOS-7 based releases can be pulled from the `centos-6` / `centos-7` Docker tags respectively. For production use it is recommended to select a specific release tag - the convention is `centos-6-1.8.3` OR `1.8.3` for the [1.8.3](https://github.com/jdeathe/centos-ssh/tree/1.8.3) release tag and `centos-7-2.3.1` OR `2.3.1` for the [2.3.1](https://github.com/jdeathe/centos-ssh/tree/2.3.1) release tag. +The latest CentOS-6 / CentOS-7 based releases can be pulled from the `centos-6` / `centos-7` Docker tags respectively. For production use it is recommended to select a specific release tag - the convention is `centos-6-1.8.4` OR `1.8.4` for the [1.8.4](https://github.com/jdeathe/centos-ssh/tree/1.8.4) release tag and `centos-7-2.3.2` OR `2.3.2` for the [2.3.2](https://github.com/jdeathe/centos-ssh/tree/2.3.2) release tag. ### Tags and respective `Dockerfile` links -- `centos-7`,`centos-7-2.3.1`,`2.3.1` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh/blob/centos-7/Dockerfile) -- `centos-6`,`centos-6-1.8.3`,`1.8.3` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh/blob/centos-6/Dockerfile) +- `centos-7`,`centos-7-2.3.2`,`2.3.2` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh/blob/centos-7/Dockerfile) +- `centos-6`,`centos-6-1.8.4`,`1.8.4` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh/blob/centos-6/Dockerfile) The Dockerfile can be used to build a base image that is the bases for several other docker images. @@ -105,10 +105,10 @@ $ docker run \ --rm \ --privileged \ --volume /:/media/root \ - jdeathe/centos-ssh:1.8.3 \ + jdeathe/centos-ssh:1.8.4 \ /usr/sbin/scmi install \ --chroot=/media/root \ - --tag=1.8.3 \ + --tag=1.8.4 \ --name=ssh.pool-1.1.1 \ --setopt="--volume {{NAME}}.config-ssh:/etc/ssh" ``` @@ -122,10 +122,10 @@ $ docker run \ --rm \ --privileged \ --volume /:/media/root \ - jdeathe/centos-ssh:1.8.3 \ + jdeathe/centos-ssh:1.8.4 \ /usr/sbin/scmi uninstall \ --chroot=/media/root \ - --tag=1.8.3 \ + --tag=1.8.4 \ --name=ssh.pool-1.1.1 \ --setopt="--volume {{NAME}}.config-ssh:/etc/ssh" ``` @@ -139,10 +139,10 @@ $ docker run \ --rm \ --privileged \ --volume /:/media/root \ - jdeathe/centos-ssh:1.8.3 \ + jdeathe/centos-ssh:1.8.4 \ /usr/sbin/scmi install \ --chroot=/media/root \ - --tag=1.8.3 \ + --tag=1.8.4 \ --name=ssh.pool-1.1.1 \ --manager=systemd \ --register \ @@ -164,7 +164,7 @@ Since release tags `1.7.2` / `2.1.2` the install template has been added to the _NOTE:_ A prerequisite of the following examples is that the image has been pulled (or loaded from the release package). ``` -$ docker pull jdeathe/centos-ssh:1.8.3 +$ docker pull jdeathe/centos-ssh:1.8.4 ``` To see detailed information about the image run `scmi` with the `--info` option. To see all available `scmi` options run with the `--help` option. @@ -173,7 +173,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:1.8.3 + jdeathe/centos-ssh:1.8.4 ) --info" ``` @@ -183,7 +183,7 @@ To perform an installation using the docker name `ssh.pool-1.2.1` simply use the $ eval "sudo -E $( docker inspect \ -f "{{.ContainerConfig.Labels.install}}" \ - jdeathe/centos-ssh:1.8.3 + jdeathe/centos-ssh:1.8.4 ) --name=ssh.pool-1.2.1" ``` @@ -193,7 +193,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:1.8.3 + jdeathe/centos-ssh:1.8.4 ) --name=ssh.pool-1.2.1" ``` @@ -206,7 +206,7 @@ To see detailed information about the image run `scmi` with the `--info` option. ``` $ sudo -E atomic install \ -n ssh.pool-1.3.1 \ - jdeathe/centos-ssh:1.8.3 \ + jdeathe/centos-ssh:1.8.4 \ --info ``` @@ -215,14 +215,14 @@ To perform an installation using the docker name `ssh.pool-1.3.1` simply use the ``` $ sudo -E atomic install \ -n ssh.pool-1.3.1 \ - jdeathe/centos-ssh:1.8.3 + jdeathe/centos-ssh:1.8.4 ``` Alternatively, you could use the `scmi` options `--name` or `-n` for naming the container. ``` $ sudo -E atomic install \ - jdeathe/centos-ssh:1.8.3 \ + jdeathe/centos-ssh:1.8.4 \ --name ssh.pool-1.3.1 ``` @@ -231,7 +231,7 @@ To uninstall use the *same command* that was used to install but with the `unins ``` $ sudo -E atomic uninstall \ -n ssh.pool-1.3.1 \ - jdeathe/centos-ssh:1.8.3 + jdeathe/centos-ssh:1.8.4 ``` #### Using environment variables diff --git a/src/etc/systemd/system/centos-ssh@.service b/src/etc/systemd/system/centos-ssh@.service index 00c75e9..c75389f 100644 --- a/src/etc/systemd/system/centos-ssh@.service +++ b/src/etc/systemd/system/centos-ssh@.service @@ -51,7 +51,7 @@ Environment="DOCKER_USER=jdeathe" Environment="DOCKER_IMAGE_NAME=centos-ssh" Environment="DOCKER_CONTAINER_OPTS=" Environment="DOCKER_IMAGE_PACKAGE_PATH=/var/opt/scmi/packages" -Environment="DOCKER_IMAGE_TAG=1.8.3" +Environment="DOCKER_IMAGE_TAG=1.8.4" Environment="DOCKER_PORT_MAP_TCP_22=2020" Environment="SSH_AUTHORIZED_KEYS=" Environment="SSH_AUTOSTART_SSHD=true"