From 5c8296236ddbc71e6c7b5a39b969d6099841a99c Mon Sep 17 00:00:00 2001 From: Maximilian Seifert Date: Tue, 6 Aug 2019 18:31:11 +0200 Subject: [PATCH] Remove superfluous scripts and docker-compose-test This MR should now comply with the current environment as Travis-CI is no longer in use. Signed-off-by: Maximilian Seifert --- docker/docker-compose-test.yml | 37 ---------------------------------- docker/test/monolith.sh | 9 --------- 2 files changed, 46 deletions(-) delete mode 100644 docker/docker-compose-test.yml delete mode 100644 docker/test/monolith.sh diff --git a/docker/docker-compose-test.yml b/docker/docker-compose-test.yml deleted file mode 100644 index d639c67aa..000000000 --- a/docker/docker-compose-test.yml +++ /dev/null @@ -1,37 +0,0 @@ -version: "3.4" -services: - monolith_test: - container_name: dendrite_monolith_test - hostname: monolith - entrypoint: ["bash", "./docker/test/monolith.sh"] - build: ./ - volumes: - - ..:/build - - ./build/pkg:/build/pkg - - ./build/bin:/build/bin - networks: - - internal - depends_on: - - postgres - ports: - - "8008:8008" - - "8448:8448" - - postgres: - container_name: dendrite_postgres - hostname: postgres - image: postgres:9.5 - restart: always - volumes: - - ./postgres/create_db.sh:/docker-entrypoint-initdb.d/20-create_db.sh - environment: - POSTGRES_PASSWORD: itsasecret - POSTGRES_USER: dendrite - networks: - - internal - ports: - - 15432:5432 - -networks: - internal: - attachable: true diff --git a/docker/test/monolith.sh b/docker/test/monolith.sh deleted file mode 100644 index 06ee6e6cd..000000000 --- a/docker/test/monolith.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -rm -rf build -bash ./docker/build.sh - -TEST_SUITE=unit-test scripts/travis-test.sh -TEST_SUITE=integ-test scripts/travis-test.sh -TEST_SUITE=lint scripts/travis-test.sh -