diff --git a/.travis.yml b/.travis.yml index 4ed1522..e38fbdd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,31 +1,4 @@ -# make use of vm's -sudo: 'required' +language: go -# have the docker service set up (we'll -# update it later) -services: - - docker - -# prepare the machine before any code -# installation scripts -before_install: - - ./.travis/main.sh - - -script: - - make docker-build - - -# only execute the following instructions in -# the case of a success (failing at this point -# won't mark the build as a failure). -# To have `DOCKER_USERNAME` and `DOCKER_PASSWORD` -# filled you need to either use `travis`' cli -# and then `travis set ..` or go to the travis -# page of your repository and then change the -# environment in the settings panel. -after_success: - - if [[ "$TRAVIS_BRANCH" == "master" ]]; then - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD ; - make docker-push ; - fi \ No newline at end of file +go: + - 1.15.x \ No newline at end of file diff --git a/.travis/main.sh b/.travis/main.sh deleted file mode 100755 index 3f900d8..0000000 --- a/.travis/main.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -set -o errexit - -main() { - setup_dependencies - update_docker_configuration - - echo "SUCCESS: - Done! Finished setting up travis machine. - " -} - -setup_dependencies() { - echo "INFO: - Setting up dependencies. - " - - sudo apt update -y - sudo apt install realpath python python-pip -y - sudo apt install --only-upgrade docker-ce -y - - sudo pip install docker-compose || true - - docker info - docker-compose --version -} - -update_docker_configuration() { - echo "INFO: - Updating docker configuration - " - - echo '{ - "experimental": true, - "storage-driver": "overlay2", - "max-concurrent-downloads": 50, - "max-concurrent-uploads": 50 -}' | sudo tee /etc/docker/daemon.json - sudo service docker restart -} - -main \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 1e87531..98e3cf6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,4 +9,9 @@ services: network_mode: "host" volumes: - /etc/wireguard:/etc/wireguard - - ./data:/app/data \ No newline at end of file + - ./data:/app/data + ports: + - '8123:8123' + environment: + - EXTERNAL_URL=http://localhost:8123 + - ADMIN_PASS=a \ No newline at end of file