diff --git a/eve/Dockerfile b/eve/Dockerfile index dba2f3b..7b9a21f 100755 --- a/eve/Dockerfile +++ b/eve/Dockerfile @@ -34,8 +34,8 @@ RUN apt-get -y update && \ # Install latest mongodb RUN if [ -n "${DB_DIR}" ] ; then \ - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 && \ - echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" > /etc/apt/sources.list.d/mongodb-org-4.0.list && \ + apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E162F504A20CDF15827F718D4B7C549A058F8B6B && \ + echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" > /etc/apt/sources.list.d/mongodb-org-4.2.list && \ apt-get -y update && \ apt-get install -y mongodb-org mongodb-org-server mongodb-org-tools mongodb-org-shell; \ fi diff --git a/run_docker_compose.sh b/run_docker_compose.sh index 48642c5..acf47d6 100755 --- a/run_docker_compose.sh +++ b/run_docker_compose.sh @@ -10,6 +10,7 @@ if [[ $# -lt 1 ]]; then exit 1 fi COMMAND="$1" +shift DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" cd ${DIR} @@ -18,13 +19,13 @@ set -x export PINE_VERSION=$(./version.sh) if [[ ${COMMAND} == --build ]]; then - docker-compose build + docker-compose build $@ elif [[ ${COMMAND} == --up ]]; then - docker-compose up --abort-on-container-exit + docker-compose up --abort-on-container-exit $@ elif [[ ${COMMAND} == --up-test ]]; then docker-compose \ -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.test.yml \ - up --abort-on-container-exit + up --abort-on-container-exit $@ elif [[ ${COMMAND} == --down ]]; then - docker-compose down + docker-compose down $@ fi