aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker-compose.yml1
-rwxr-xr-xscript/bootstrap7
2 files changed, 6 insertions, 2 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 80f0b56f1..cc653c922 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,7 @@ services:
FMS_ROOT: '/var/www/fixmystreet/fixmystreet'
SUPERUSER_EMAIL: 'superuser@example.org'
SUPERUSER_PASSWORD: '5up3r53cr3t'
+ SKIP_PACKAGES_INSTALL:
networks:
default:
aliases:
diff --git a/script/bootstrap b/script/bootstrap
index 5345b163e..10dc94bdf 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -7,10 +7,13 @@ git submodule --quiet update --init --recursive --rebase
# Let's see if we can't work out where we might be running.
if cut -d/ -f2 /proc/self/cgroup | sort -u | grep -q docker ; then
- # Docker
- sudo bin/install_packages docker
+ if [ -z ${SKIP_PACKAGES_INSTALL:+x} ] ; then
+ echo "==> Installing Docker packages..."
+ sudo bin/install_packages docker
+ fi
else
# Fallback
+ echo "==> Installing generic packages..."
sudo bin/install_packages generic
fi