From ff59914aed73a4e4eed195e173f01973d3c40e31 Mon Sep 17 00:00:00 2001 From: Mendel Greenberg Date: Tue, 2 Jul 2019 07:42:20 -0400 Subject: [PATCH] some small refractoring --- .travis.yml | 5 ----- Dockerfile | 2 +- test.sh | 6 ++++++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 058bfdfb..de8802ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,10 +26,5 @@ install: - ./dbench setup hosts script: - - docker-compose ps | grep -i frappe - - docker-compose ps | grep -i redis-cache - - docker-compose ps | grep -i redis-queue - - docker-compose ps | grep -i redis-socketio - - docker-compose ps | grep -i mariadb - ./test.sh - ./dbench setup docker stop diff --git a/Dockerfile b/Dockerfile index 38194713..cabd0a60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM debian:9.6-slim LABEL author=frappé -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-suggests --no-install-recommends locales \ +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends locales \ && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \ && dpkg-reconfigure --frontend=noninteractive locales \ && apt-get clean && rm -rf /var/lib/apt/lists/* diff --git a/test.sh b/test.sh index 0896e498..e5363638 100644 --- a/test.sh +++ b/test.sh @@ -1,5 +1,11 @@ #!/bin/bash +docker container ls | grep -i frappe +docker container ls | grep -i redis-cache +docker container ls | grep -i redis-queue +docker container ls | grep -i redis-socketio +docker container ls | grep -i mariadb + cat <(./dbench start) & sleep 5