aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorterminaldweller <thabogre@gmail.com>2021-02-25 09:09:47 +0000
committerterminaldweller <thabogre@gmail.com>2021-02-25 09:09:47 +0000
commitfb3045d72ac1381a7c4fe088987b5988f6bf08e1 (patch)
treef1058ae5441f06ef0ba7fe1a76ef4b08ad18942a
parentadded the secrets as env vars to travis build. added the travis badge (diff)
downloadhived-fb3045d72ac1381a7c4fe088987b5988f6bf08e1.tar.gz
hived-fb3045d72ac1381a7c4fe088987b5988f6bf08e1.zip
made a new docker-compose file for travis tests only
-rw-r--r--.travis.yml2
-rw-r--r--docker-compose-travis.yaml32
-rwxr-xr-xruntravis.sh2
3 files changed, 35 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 49f8b3e..2434222 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,5 +11,5 @@ services:
before_install:
- docker pull redis:6.2-alpine
install:
-- docker build -t hived ./ && docker-compose up -d
+- docker build -t hived ./ && docker-compose -f ./docker-compose-travis.yaml up -d
- "./test/endpoints.sh"
diff --git a/docker-compose-travis.yaml b/docker-compose-travis.yaml
new file mode 100644
index 0000000..6d1a06d
--- /dev/null
+++ b/docker-compose-travis.yaml
@@ -0,0 +1,32 @@
+version: "3.4"
+services:
+ hived:
+ image: hived
+ build:
+ context: ./
+ networks:
+ - hivednet
+ restart: unless-stopped
+ ports:
+ - "8008:8008"
+ depends_on:
+ - redis
+ entrypoint: /hived/docker-entrypoint.sh
+ redis:
+ image: redis:6.2-alpine
+ networks:
+ - hivednet
+ restart: unless-stopped
+ ports:
+ - "6379:6379"
+ environment:
+ - ALLOW_EMPTY_PASSWORD=yes
+ volumes:
+ - redis-data:/data/
+networks:
+ hivednet:
+ driver: bridge
+ routenet:
+ driver: bridge
+volumes:
+ redis-data:
diff --git a/runtravis.sh b/runtravis.sh
new file mode 100755
index 0000000..10ee492
--- /dev/null
+++ b/runtravis.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+