Mercurial > hg > soundsoftware-site
changeset 1588:9149f2098413 dockerise
Minor rejig
| author | Chris Cannam |
|---|---|
| date | Thu, 17 Aug 2017 12:06:04 +0100 |
| parents | d8949733849d |
| children | 94669513c53c |
| files | .dockerignore deploy/provision.d/040-hg-dir.sh deploy/provision.d/110-apache-start.sh deploy/provision.d/110-hg-testdir.sh deploy/provision.d/200-apache-start.sh |
| diffstat | 5 files changed, 20 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/.dockerignore Thu Aug 17 11:55:29 2017 +0100 +++ b/.dockerignore Thu Aug 17 12:06:04 2017 +0100 @@ -1,5 +1,6 @@ .dockerignore .hg -extra/soundsoftware/dockertest/Dockerfile -extra/soundsoftware/dockertest/start.sh +.hgignore +deploy/docker/Dockerfile +deploy/docker/start.sh *.log
--- a/deploy/provision.d/040-hg-dir.sh Thu Aug 17 11:55:29 2017 +0100 +++ b/deploy/provision.d/040-hg-dir.sh Thu Aug 17 12:06:04 2017 +0100 @@ -10,11 +10,3 @@ cp /var/www/code/deploy/config/hgweb.config /var/hg/ chmod +x /var/hg/index.cgi fi - -if [ ! -d /var/hg/vamp-plugin-sdk ]; then - # This project can be used for testing - echo "Cloning vamp-plugin-sdk repo for testing..." - cd /var/hg - hg clone https://code.soundsoftware.ac.uk/hg/vamp-plugin-sdk - chown -R code.www-data vamp-plugin-sdk -fi
--- a/deploy/provision.d/110-apache-start.sh Thu Aug 17 11:55:29 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -#!/bin/bash - -set -e - -apache2ctl restart -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/deploy/provision.d/110-hg-testdir.sh Thu Aug 17 12:06:04 2017 +0100 @@ -0,0 +1,11 @@ +#!/bin/bash + +set -e + +if [ ! -d /var/hg/vamp-plugin-sdk ]; then + # This project can be used for testing + echo "Cloning vamp-plugin-sdk repo for testing..." + cd /var/hg + hg clone https://code.soundsoftware.ac.uk/hg/vamp-plugin-sdk + chown -R code.www-data vamp-plugin-sdk +fi