diff --git a/docker/README.md b/docker/README.md index f4bb12a2..57aff1d8 100644 --- a/docker/README.md +++ b/docker/README.md @@ -47,7 +47,7 @@ To only run certain docker images, supply them as arguments, e.g. ./docker/run_docker.bsh debian_7 ./docker/run_docker.bsh centos_7 debian_8 - ./docker/run_docker.bsh centos_{5,6,7} + ./docker/run_docker.bsh centos_{6,7} And only those images will be run. @@ -104,7 +104,7 @@ will be extracted from the images and saved in the `./repo` directory. ./docker/run_dockers.bsh centos_6_env centos_6 This isn't all that important anymore, unless you want ruby2 and the gems used to -make the man pages for Centos 5/6 where ruby2 is not natively available. Calling +make the man pages for CentOS 6 where ruby2 is not natively available. Calling the environment building images only needs to be done once, they should remain in the `./repo` directory afterwards. @@ -262,19 +262,9 @@ also work with 4096 bit RSA signing keys. CentOS will **not** work with subkeys[3]. CentOS 6 and 7 will work with 4096 bit RSA signing keys -CentOS 5 will **not** work with v4 signatures. The rpms will be so unrecognizable -that it can't even be installed with --nogpgcheck. It should work with RSA on v3. -However, it does not. It builds v3 correctly, but for some reason the GPG check -fails for RSA. CentOS 5 will **not** work with 2048 bit DSA keys... I suspect -2048 is too big for it to fathom. CentOS 5 **will** work with 1024 bit DSA keys. - You can make a 4096 RSA key for Debian and CentOS 6/7 (4 for step 1 above, and -4096 for step 2) and a 1024 DSA key for CentOS 5 (3 for step 1 above, and 1024 -for step 2. And be sure to make the key in a CentOS 5 docker.). And only have two -keys... Or optionally a 4096 RSA subkey for Debain -[1]. Or a key for each distro. Dealers choice. You should have least two since -1024 bit isn't that great and you are only using it for CentOS 5 because nothing -else works. +4096 for step 2). And only have two keys... Or optionally a 4096 RSA subkey for Debain +[1]. Or a key for each distro. Dealers choice. [1] https://www.digitalocean.com/community/tutorials/how-to-use-reprepro-for-a-secure-package-repository-on-ubuntu-14-04 diff --git a/docker/run_dockers.bsh b/docker/run_dockers.bsh index daccaa0e..c9a13de8 100755 --- a/docker/run_dockers.bsh +++ b/docker/run_dockers.bsh @@ -2,7 +2,7 @@ # Usage: # ./run_dockers.bsh - Run all the docker images -# ./run_dockers.bsh centos_5 centos_7 - Run only CentOS 5 & 7 image +# ./run_dockers.bsh centos_6 centos_7 - Run only CentOS 6 & 7 image # ./run_dockers.bsh centos_6 -- bash #Runs bash in the CentOS 6 docker # # Special Environmet Variables @@ -54,7 +54,7 @@ while [[ $# > 0 ]]; do done if [[ ${#IMAGES[@]} == 0 ]]; then - IMAGES=(centos_5 centos_6 centos_7 debian_7 debian_8) + IMAGES=(centos_6 centos_7 debian_7 debian_8) fi mkdir -p "${PACKAGE_DIR}" @@ -104,4 +104,4 @@ for IMAGE_NAME in "${IMAGES[@]}"; do done -echo "Docker run completed successfully!" \ No newline at end of file +echo "Docker run completed successfully!" diff --git a/docker/test_dockers.bsh b/docker/test_dockers.bsh index 17cd724b..60da28c6 100755 --- a/docker/test_dockers.bsh +++ b/docker/test_dockers.bsh @@ -4,4 +4,4 @@ CUR_DIR=$(dirname "${BASH_SOURCE[0]}") -${CUR_DIR}/run_dockers.bsh centos_5_test centos_6_test centos_7_test debian_7_test debian_8_test "${@}" +${CUR_DIR}/run_dockers.bsh centos_6_test centos_7_test debian_7_test debian_8_test "${@}"