From b2d8adc4725aa75afed4afccba12149bf081e7a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20=C5=A0trauch?= Date: Sun, 2 Feb 2020 22:07:48 +0100 Subject: [PATCH 01/10] Create LICENSE --- LICENSE | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d2867b9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,29 @@ +BSD 3-Clause License + +Copyright (c) 2020, Rošti.cz, s.r.o. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From a5ec99f4464b921bbfe40e3720e163243ac189b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20=C5=A0trauch?= Date: Sun, 2 Feb 2020 23:57:03 +0100 Subject: [PATCH 02/10] Fix --- tests.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests.sh b/tests.sh index adc236b..378ac84 100755 --- a/tests.sh +++ b/tests.sh @@ -20,7 +20,7 @@ function stop() { # Default page run -$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep "Roští.cz" > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "Roští.cz" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT default response correct" else @@ -36,9 +36,9 @@ stop # Node.js 12.14.1 run -$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-12.14.1 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-12.14.1 $CONTAINER_NAME su app -c rosti > /dev/null sleep 3 -$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Node.js 12.14.1 response correct" else @@ -53,9 +53,9 @@ stop # Node.js 13.7.0 run -$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-13.7.0 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-13.7.0 $CONTAINER_NAME su app -c rosti > /dev/null sleep 3 -$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Node.js 13.7.0 response correct" else @@ -71,9 +71,9 @@ stop # Python 3.8.2 run -$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=python-3.8.1 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=python-3.8.1 $CONTAINER_NAME su app -c rosti > /dev/null sleep 5 -$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep "app.py" > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "app.py" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Python 3.8.1 response correct" else @@ -88,9 +88,9 @@ stop # PHP 7.4.2 run -$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=php-7.4.2 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=php-7.4.2 $CONTAINER_NAME su app -c rosti > /dev/null sleep 5 -$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep "PHP aplikaci" > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "PHP aplikaci" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT PHP 7.4.2 response correct" else From 2c495e4a7c3447643c9672adfa2ff77d0b4f163c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20=C5=A0trauch?= Date: Mon, 3 Feb 2020 00:28:14 +0100 Subject: [PATCH 03/10] Debug --- tests.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tests.sh b/tests.sh index 378ac84..1d5d8ed 100755 --- a/tests.sh +++ b/tests.sh @@ -20,7 +20,8 @@ function stop() { # Default page run -$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "Roští.cz" > /dev/null +$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 +$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep "Roští.cz" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT default response correct" else @@ -36,9 +37,9 @@ stop # Node.js 12.14.1 run -$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-12.14.1 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-12.14.1 $CONTAINER_NAME su app -c rosti > /dev/null sleep 3 -$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null +$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Node.js 12.14.1 response correct" else @@ -53,9 +54,9 @@ stop # Node.js 13.7.0 run -$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-13.7.0 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-13.7.0 $CONTAINER_NAME su app -c rosti > /dev/null sleep 3 -$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null +$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Node.js 13.7.0 response correct" else @@ -71,9 +72,9 @@ stop # Python 3.8.2 run -$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=python-3.8.1 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=python-3.8.1 $CONTAINER_NAME su app -c rosti > /dev/null sleep 5 -$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "app.py" > /dev/null +$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep "app.py" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Python 3.8.1 response correct" else @@ -88,9 +89,9 @@ stop # PHP 7.4.2 run -$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=php-7.4.2 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=php-7.4.2 $CONTAINER_NAME su app -c rosti > /dev/null sleep 5 -$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "PHP aplikaci" > /dev/null +$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep "PHP aplikaci" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT PHP 7.4.2 response correct" else From 9ef581193cfcf576ff28bccc48267568be83f489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20=C5=A0trauch?= Date: Mon, 3 Feb 2020 01:10:12 +0100 Subject: [PATCH 04/10] Fix --- tests.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests.sh b/tests.sh index 1d5d8ed..bf47067 100755 --- a/tests.sh +++ b/tests.sh @@ -20,8 +20,8 @@ function stop() { # Default page run -$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 -$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep "Roští.cz" > /dev/null +$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 +$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep "Roští.cz" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT default response correct" else @@ -37,9 +37,9 @@ stop # Node.js 12.14.1 run -$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-12.14.1 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-12.14.1 $CONTAINER_NAME su app -c rosti > /dev/null sleep 3 -$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null +$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Node.js 12.14.1 response correct" else @@ -54,9 +54,9 @@ stop # Node.js 13.7.0 run -$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-13.7.0 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-13.7.0 $CONTAINER_NAME su app -c rosti > /dev/null sleep 3 -$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null +$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Node.js 13.7.0 response correct" else @@ -72,9 +72,9 @@ stop # Python 3.8.2 run -$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=python-3.8.1 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=python-3.8.1 $CONTAINER_NAME su app -c rosti > /dev/null sleep 5 -$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep "app.py" > /dev/null +$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep "app.py" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Python 3.8.1 response correct" else @@ -89,9 +89,9 @@ stop # PHP 7.4.2 run -$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=php-7.4.2 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=php-7.4.2 $CONTAINER_NAME su app -c rosti > /dev/null sleep 5 -$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep "PHP aplikaci" > /dev/null +$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep "PHP aplikaci" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT PHP 7.4.2 response correct" else From 736d0cd86df451032b2eed4456469b111c41598b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20=C5=A0trauch?= Date: Mon, 3 Feb 2020 02:30:14 +0100 Subject: [PATCH 05/10] Fix no-tty tests --- rosti.sh | 2 ++ tests.sh | 19 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/rosti.sh b/rosti.sh index 88095e7..4e2ccd9 100755 --- a/rosti.sh +++ b/rosti.sh @@ -1,5 +1,7 @@ #!/bin/bash +. ~/.bashrc + WIDTH=180 HEIGHT=25 diff --git a/tests.sh b/tests.sh index bf47067..378ac84 100755 --- a/tests.sh +++ b/tests.sh @@ -20,8 +20,7 @@ function stop() { # Default page run -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep "Roští.cz" > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "Roští.cz" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT default response correct" else @@ -37,9 +36,9 @@ stop # Node.js 12.14.1 run -$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-12.14.1 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-12.14.1 $CONTAINER_NAME su app -c rosti > /dev/null sleep 3 -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Node.js 12.14.1 response correct" else @@ -54,9 +53,9 @@ stop # Node.js 13.7.0 run -$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-13.7.0 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-13.7.0 $CONTAINER_NAME su app -c rosti > /dev/null sleep 3 -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Node.js 13.7.0 response correct" else @@ -72,9 +71,9 @@ stop # Python 3.8.2 run -$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=python-3.8.1 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=python-3.8.1 $CONTAINER_NAME su app -c rosti > /dev/null sleep 5 -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep "app.py" > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "app.py" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Python 3.8.1 response correct" else @@ -89,9 +88,9 @@ stop # PHP 7.4.2 run -$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=php-7.4.2 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=php-7.4.2 $CONTAINER_NAME su app -c rosti > /dev/null sleep 5 -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep "PHP aplikaci" > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "PHP aplikaci" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT PHP 7.4.2 response correct" else From 5a2a6f9d32a54ba3d98adf80c026c523b5902d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20=C5=A0trauch?= Date: Mon, 3 Feb 2020 00:28:14 +0100 Subject: [PATCH 06/10] Debug --- tests.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tests.sh b/tests.sh index 378ac84..1d5d8ed 100755 --- a/tests.sh +++ b/tests.sh @@ -20,7 +20,8 @@ function stop() { # Default page run -$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "Roští.cz" > /dev/null +$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 +$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep "Roští.cz" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT default response correct" else @@ -36,9 +37,9 @@ stop # Node.js 12.14.1 run -$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-12.14.1 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-12.14.1 $CONTAINER_NAME su app -c rosti > /dev/null sleep 3 -$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null +$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Node.js 12.14.1 response correct" else @@ -53,9 +54,9 @@ stop # Node.js 13.7.0 run -$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-13.7.0 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-13.7.0 $CONTAINER_NAME su app -c rosti > /dev/null sleep 3 -$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null +$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Node.js 13.7.0 response correct" else @@ -71,9 +72,9 @@ stop # Python 3.8.2 run -$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=python-3.8.1 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=python-3.8.1 $CONTAINER_NAME su app -c rosti > /dev/null sleep 5 -$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "app.py" > /dev/null +$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep "app.py" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Python 3.8.1 response correct" else @@ -88,9 +89,9 @@ stop # PHP 7.4.2 run -$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=php-7.4.2 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=php-7.4.2 $CONTAINER_NAME su app -c rosti > /dev/null sleep 5 -$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "PHP aplikaci" > /dev/null +$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep "PHP aplikaci" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT PHP 7.4.2 response correct" else From e30736af0bdb10e8bc220391ad1cba0e03e75288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20=C5=A0trauch?= Date: Mon, 3 Feb 2020 01:10:12 +0100 Subject: [PATCH 07/10] Fix --- tests.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests.sh b/tests.sh index 1d5d8ed..bf47067 100755 --- a/tests.sh +++ b/tests.sh @@ -20,8 +20,8 @@ function stop() { # Default page run -$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 -$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep "Roští.cz" > /dev/null +$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 +$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep "Roští.cz" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT default response correct" else @@ -37,9 +37,9 @@ stop # Node.js 12.14.1 run -$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-12.14.1 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-12.14.1 $CONTAINER_NAME su app -c rosti > /dev/null sleep 3 -$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null +$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Node.js 12.14.1 response correct" else @@ -54,9 +54,9 @@ stop # Node.js 13.7.0 run -$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-13.7.0 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-13.7.0 $CONTAINER_NAME su app -c rosti > /dev/null sleep 3 -$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null +$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Node.js 13.7.0 response correct" else @@ -72,9 +72,9 @@ stop # Python 3.8.2 run -$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=python-3.8.1 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=python-3.8.1 $CONTAINER_NAME su app -c rosti > /dev/null sleep 5 -$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep "app.py" > /dev/null +$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep "app.py" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Python 3.8.1 response correct" else @@ -89,9 +89,9 @@ stop # PHP 7.4.2 run -$DOCKER exec -ti -e TESTMODE=1 -e MENUITEM=tech -e TECH=php-7.4.2 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=php-7.4.2 $CONTAINER_NAME su app -c rosti > /dev/null sleep 5 -$DOCKER exec -ti $CONTAINER_NAME curl http://localhost:8000 | grep "PHP aplikaci" > /dev/null +$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep "PHP aplikaci" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT PHP 7.4.2 response correct" else From 175fd9057d43ebfbbe24e832126943b45b1e5984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20=C5=A0trauch?= Date: Mon, 3 Feb 2020 02:30:14 +0100 Subject: [PATCH 08/10] Fix no-tty tests --- tests.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tests.sh b/tests.sh index bf47067..378ac84 100755 --- a/tests.sh +++ b/tests.sh @@ -20,8 +20,7 @@ function stop() { # Default page run -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep "Roští.cz" > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "Roští.cz" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT default response correct" else @@ -37,9 +36,9 @@ stop # Node.js 12.14.1 run -$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-12.14.1 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-12.14.1 $CONTAINER_NAME su app -c rosti > /dev/null sleep 3 -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Node.js 12.14.1 response correct" else @@ -54,9 +53,9 @@ stop # Node.js 13.7.0 run -$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-13.7.0 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=node-13.7.0 $CONTAINER_NAME su app -c rosti > /dev/null sleep 3 -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep package.json > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Node.js 13.7.0 response correct" else @@ -72,9 +71,9 @@ stop # Python 3.8.2 run -$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=python-3.8.1 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=python-3.8.1 $CONTAINER_NAME su app -c rosti > /dev/null sleep 5 -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep "app.py" > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "app.py" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT Python 3.8.1 response correct" else @@ -89,9 +88,9 @@ stop # PHP 7.4.2 run -$DOCKER exec-t -e TESTMODE=1 -e MENUITEM=tech -e TECH=php-7.4.2 $CONTAINER_NAME su app -c rosti > /dev/null +$DOCKER exec -e TESTMODE=1 -e MENUITEM=tech -e TECH=php-7.4.2 $CONTAINER_NAME su app -c rosti > /dev/null sleep 5 -$DOCKER exec-t $CONTAINER_NAME curl http://localhost:8000 | grep "PHP aplikaci" > /dev/null +$DOCKER exec $CONTAINER_NAME curl http://localhost:8000 | grep "PHP aplikaci" > /dev/null if [ $? -eq 0 ]; then echo "$I/$COUNT PHP 7.4.2 response correct" else From 3f09d038ea842208576659b546159b0a697854c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20=C5=A0trauch?= Date: Wed, 5 Feb 2020 23:04:10 +0100 Subject: [PATCH 09/10] Add SOAPClient into PHP build + boost version --- Makefile | 2 +- build_php.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9b82291..e3a4f4c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ DOCKER=docker -VERSION=2020.01-beta-1 +VERSION=2020.02 all: build diff --git a/build_php.sh b/build_php.sh index eb1283c..dd4c081 100755 --- a/build_php.sh +++ b/build_php.sh @@ -61,7 +61,8 @@ cd php-$VERSION --enable-opcache \ --with-imap \ --with-imap-ssl \ - --with-kerberos + --with-kerberos \ + --with-soapclient make -j make install From 71de1952bd2ab72cf5f627c63ab1fe838c4d9c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20=C5=A0trauch?= Date: Thu, 13 Feb 2020 00:25:24 +0100 Subject: [PATCH 10/10] Redis module, PEAR + PECL added into PHP --- Dockerfile | 2 +- Makefile | 4 +++- build_php.sh | 7 ++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index cf30668..2a88cb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ imagemagick libmagickwand-dev ncdu \ libcurl4-openssl-dev python3 python3-pip python3-virtualenv \ libcurl4-openssl-dev python-dev libproj-dev gdal-bin libmemcached-dev swig mutt \ imagemagick ffmpeg libyaml-dev libc-client2007e-dev libonig-dev libkrb5-dev dialog \ -whiptail tmux +whiptail tmux rsync nmap WORKDIR /srv diff --git a/Makefile b/Makefile index e3a4f4c..2ad3c60 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,17 @@ DOCKER=docker -VERSION=2020.02 +VERSION=2020.02-2 all: build build: + $(DOCKER) pull debian:buster $(DOCKER) build -t rosti/runtime:dev . test: build DOCKER=$(DOCKER) ./tests.sh squashed: + $(DOCKER) pull debian:buster $(DOCKER) build --squash -t rosti/runtime:dev-squashed . push: squashed diff --git a/build_php.sh b/build_php.sh index dd4c081..fe4c335 100755 --- a/build_php.sh +++ b/build_php.sh @@ -62,9 +62,14 @@ cd php-$VERSION --with-imap \ --with-imap-ssl \ --with-kerberos \ - --with-soapclient + --with-soapclient \ + --with-pear make -j make install mkdir -p /opt/techs/php-$VERSION/etc/conf.d/ ln -s /srv/conf/php-fpm/php.ini /opt/techs/php-$VERSION/etc/conf.d/app.ini + +echo "no" | /opt/techs/php-$VERSION/bin/pecl install redis + +echo "extension=redis.so" > /opt/techs/php-$VERSION/etc/conf.d/extensions.ini