From e83d166600c3d77692b01385eaa41c7eb43fa830 Mon Sep 17 00:00:00 2001 From: James Deathe Date: Thu, 15 Dec 2016 01:21:19 +0000 Subject: [PATCH] Updates ready for 1.7.5/2.1.5 releases. --- CHANGELOG.md | 14 +++++++++++ Dockerfile | 2 +- README.md | 32 +++++++++++++------------- etc/systemd/system/centos-ssh@.service | 2 +- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de0c87c..e778cb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,20 @@ Summary of release changes for Version 2 - CentOS-7 +### 2.1.5 - 2016-12-15 + +- Adds updated `sudo`, `openssh`, `yum-plugin-versionlock` and `xz` packages. +- Adds functional tests using [shpec](https://github.com/rylnd/shpec). To run all tests, [install `shpec`](https://github.com/rylnd/shpec#installation) and run with `make test`. +- Adds support for running tests on Ubuntu. _Note: May require some additional setup prevent warnings about locale._ + + ``` + sudo locale-gen en_US.UTF-8; sudo dpkg-reconfigure locales + export LANG=en_US.UTF-8; unset LANGUAGE LC_ALL LC_CTYPE + ``` +- Adds correction to examples and test usage of the `sftp` command. +- Adds a "better practices" example of password hash generation in the `README.md`. +- Adds minor code style changes to the `Makefile`. + ### 2.1.4 - 2016-12-04 - Adds correct Makefile usage instructions for 'build' target. diff --git a/Dockerfile b/Dockerfile index dffdb81..43a7a70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -151,7 +151,7 @@ ENV SSH_AUTHORIZED_KEYS="" \ # ----------------------------------------------------------------------------- # Set image metadata # ----------------------------------------------------------------------------- -ARG RELEASE_VERSION="2.1.4" +ARG RELEASE_VERSION="2.1.5" LABEL \ install="docker run \ --rm \ diff --git a/README.md b/README.md index 2571d23..41dfe0e 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.7.4` OR `1.7.4` for the [1.7.4](https://github.com/jdeathe/centos-ssh/tree/1.7.4) release tag and `centos-7-2.1.4` OR `2.1.4` for the [2.1.4](https://github.com/jdeathe/centos-ssh/tree/2.1.4) 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.7.5` OR `1.7.5` for the [1.7.5](https://github.com/jdeathe/centos-ssh/tree/1.7.5) release tag and `centos-7-2.1.5` OR `2.1.5` for the [2.1.5](https://github.com/jdeathe/centos-ssh/tree/2.1.5) release tag. ### Tags and respective `Dockerfile` links -- `centos-7`,`centos-7-2.1.4`,`2.1.4` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh/blob/centos-7/Dockerfile) -- `centos-6`,`centos-6-1.7.4`,`1.7.4` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh/blob/centos-6/Dockerfile) +- `centos-7`,`centos-7-2.1.5`,`2.1.5` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh/blob/centos-7/Dockerfile) +- `centos-6`,`centos-6-1.7.5`,`1.7.5` [(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:2.1.4 \ + jdeathe/centos-ssh:2.1.5 \ /usr/sbin/scmi install \ --chroot=/media/root \ - --tag=2.1.4 \ + --tag=2.1.5 \ --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:2.1.4 \ + jdeathe/centos-ssh:2.1.5 \ /usr/sbin/scmi uninstall \ --chroot=/media/root \ - --tag=2.1.4 \ + --tag=2.1.5 \ --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:2.1.4 \ + jdeathe/centos-ssh:2.1.5 \ /usr/sbin/scmi install \ --chroot=/media/root \ - --tag=2.1.4 \ + --tag=2.1.5 \ --name=ssh.pool-1.1.1 \ --manager=systemd \ --register \ @@ -165,7 +165,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:2.1.4 + jdeathe/centos-ssh:2.1.5 ) --info" ``` @@ -175,7 +175,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:2.1.4 + jdeathe/centos-ssh:2.1.5 ) --name=ssh.pool-1.2.1" ``` @@ -185,7 +185,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:2.1.4 + jdeathe/centos-ssh:2.1.5 ) --name=ssh.pool-1.2.1" ``` @@ -198,7 +198,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:2.1.4 \ + jdeathe/centos-ssh:2.1.5 \ --info ``` @@ -207,14 +207,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:2.1.4 + jdeathe/centos-ssh:2.1.5 ``` Alternatively, you could use the `scmi` options `--name` or `-n` for naming the container. ``` $ sudo -E atomic install \ - jdeathe/centos-ssh:2.1.4 \ + jdeathe/centos-ssh:2.1.5 \ --name ssh.pool-1.3.1 ``` @@ -223,7 +223,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:2.1.4 + jdeathe/centos-ssh:2.1.5 ``` #### Using environment variables diff --git a/etc/systemd/system/centos-ssh@.service b/etc/systemd/system/centos-ssh@.service index 05841a3..1b7bfab 100644 --- a/etc/systemd/system/centos-ssh@.service +++ b/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=2.1.4" +Environment="DOCKER_IMAGE_TAG=2.1.5" Environment="DOCKER_PORT_MAP_TCP_22=2020" Environment="SSH_AUTHORIZED_KEYS=" Environment="SSH_AUTOSTART_SSHD=true"