Skip to content

Commit 9cacbac

Browse files
mboersmamboersma
committed
Updated image prep scripts.
1 parent 58c0429 commit 9cacbac

8 files changed

Lines changed: 39 additions & 41 deletions

‎contrib/digitalocean/prepare-controller-image.sh‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,23 @@ apt-get update
2525
apt-get upgrade -yq
2626

2727
# install required packages
28-
apt-get install lxc-docker-0.7.6 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
28+
apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
2929

3030
# wait for docker to start
3131
while [ ! -e /var/run/docker.sock ] ; do
3232
inotifywait -t 2 -e create $(dirname /var/run/docker.sock)
3333
done
3434

3535
# pull docker images
36-
docker pull deis/etcd
37-
docker pull deis/postgres
38-
docker pull deis/redis
36+
docker pull deis/logger
3937
docker pull deis/server
4038
docker pull deis/worker
41-
docker pull deis/registry
4239
docker pull deis/builder
43-
docker pull deis/rsyslog
40+
docker pull deis/database
41+
docker pull deis/registry
42+
docker pull deis/discovery
43+
docker pull deis/cache
44+
docker pull deis/data
4445

4546
# install chef 11.x deps
4647
apt-get install -yq ruby1.9.1 ruby1.9.1-dev make

‎contrib/digitalocean/prepare-node-image.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ apt-get update
2525
apt-get upgrade -yq
2626

2727
# install required packages
28-
apt-get install lxc-docker-0.7.6 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
28+
apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
2929

3030
# wait for docker to start
3131
while [ ! -e /var/run/docker.sock ] ; do

‎contrib/digitalocean/provision-digitalocean-controller.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ if ! test -e $ssh_key_path; then
8989
--data-urlencode "client_id=$client_id" \
9090
--data-urlencode "api_key=$api_key" \
9191
https://api.digitalocean.com/ssh_keys/new
92-
ssh-add $ssh_key_path
9392
set +x
9493
echo_color "Saved to $ssh_key_path"
9594
else

‎contrib/ec2/prepare-controller-ami.sh‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,23 @@ apt-get update
3030
apt-get dist-upgrade -yq
3131

3232
# install required packages
33-
apt-get install lxc-docker-0.7.6 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
33+
apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
3434

3535
# wait for docker to start
3636
while [ ! -e /var/run/docker.sock ] ; do
3737
inotifywait -t 2 -e create $(dirname /var/run/docker.sock)
3838
done
3939

4040
# pull docker images
41-
docker pull deis/etcd
42-
docker pull deis/postgres
43-
docker pull deis/redis
41+
docker pull deis/logger
4442
docker pull deis/server
4543
docker pull deis/worker
46-
docker pull deis/registry
4744
docker pull deis/builder
48-
docker pull deis/rsyslog
45+
docker pull deis/database
46+
docker pull deis/registry
47+
docker pull deis/discovery
48+
docker pull deis/cache
49+
docker pull deis/data
4950

5051
# install chef 11.x deps
5152
apt-get install -yq ruby1.9.1 ruby1.9.1-dev make

‎contrib/ec2/prepare-node-ami.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ apt-get update
3030
apt-get dist-upgrade -yq
3131

3232
# install required packages
33-
apt-get install lxc-docker-0.7.6 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
33+
apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
3434

3535
# wait for docker to start
3636
while [ ! -e /var/run/docker.sock ] ; do

‎contrib/rackspace/prepare-controller-image.sh‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@
1919
# Remove old kernel(s)
2020
dpkg -l 'linux-*' | sed '/^ii/!d;/'"$(uname -r | sed "s/\(.*\)-\([^0-9]\+\)/\1/")"'/d;s/^[^ ]* [^ ]* \([^ ]*\).*/\1/;/[0-9]/!d' | xargs sudo apt-get -y purge
2121

22-
apt-get install fail2ban python-software-properties -y
23-
24-
# Add the Nginx repository key to our local keychain
25-
# using apt-key finger you can check the fingerprint matches 573B FD6B 3D8F BC64 1079 A6AB ABF5 BD82 7BD9 BF62
26-
curl http://nginx.org/keys/nginx_signing.key | apt-key add -
27-
28-
# Add the Nginx repository to our apt sources list
29-
echo deb http://nginx.org/packages/ubuntu precise nginx > /etc/apt/sources.list.d/nginx-ppa.list
30-
3122
# Add the Docker repository key to your local keychain
3223
# using apt-key finger you can check the fingerprint matches 36A1 D786 9245 C895 0F96 6E92 D857 6A8B A88D 21E9
3324
curl https://get.docker.io/gpg | apt-key add -
@@ -40,15 +31,23 @@ apt-get update
4031
apt-get dist-upgrade -yq
4132

4233
# install required packages
43-
apt-get install lxc-docker-0.7.6 curl git inotify-tools make python-setuptools python-pip -yq
34+
apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
4435

4536
# wait for docker to start
4637
while [ ! -e /var/run/docker.sock ] ; do
4738
inotifywait -t 2 -e create $(dirname /var/run/docker.sock)
4839
done
4940

50-
# pull progrium/cedarish docker image
51-
docker pull progrium/cedarish
41+
# pull docker images
42+
docker pull deis/logger
43+
docker pull deis/server
44+
docker pull deis/worker
45+
docker pull deis/builder
46+
docker pull deis/database
47+
docker pull deis/registry
48+
docker pull deis/discovery
49+
docker pull deis/cache
50+
docker pull deis/data
5251

5352
# install chef 11.x deps
5453
apt-get install -yq ruby1.9.1 ruby1.9.1-dev make

‎contrib/rackspace/prepare-node-image.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ apt-get update
2525
apt-get upgrade -yq
2626

2727
# install required packages
28-
apt-get install lxc-docker-0.7.6 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
28+
apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
2929

3030
# wait for docker to start
3131
while [ ! -e /var/run/docker.sock ] ; do

‎contrib/vagrant/prepare-ubuntu-box.sh‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,6 @@ dpkg -l 'linux-*' | sed '/^ii/!d;/'"$(uname -r | sed "s/\(.*\)-\([^0-9]\+\)/\1/"
2020
# Remove any temporary work files, including the postinstall.sh script
2121
rm -f /home/${account}/{*.iso,postinstall*.sh}
2222

23-
# Install some essentials and mDNS daemon
24-
apt-get install fail2ban python-software-properties curl apt-transport-https -y
25-
26-
# Add the Nginx repository key to our local keychain
27-
# using apt-key finger you can check the fingerprint matches 573B FD6B 3D8F BC64 1079 A6AB ABF5 BD82 7BD9 BF62
28-
curl http://nginx.org/keys/nginx_signing.key | apt-key add -
29-
30-
# Add the Nginx repository to our apt sources list
31-
echo deb http://nginx.org/packages/ubuntu precise nginx > /etc/apt/sources.list.d/nginx-ppa.list
32-
3323
# Add the Docker repository key to your local keychain
3424
# using apt-key finger you can check the fingerprint matches 36A1 D786 9245 C895 0F96 6E92 D857 6A8B A88D 21E9
3525
curl https://get.docker.io/gpg | apt-key add -
@@ -42,15 +32,23 @@ apt-get update
4232
apt-get dist-upgrade -yq
4333

4434
# install required packages
45-
apt-get install lxc-docker-0.7.6 git inotify-tools make python-setuptools python-pip -yq
35+
apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
4636

4737
# wait for docker to start
4838
while [ ! -e /var/run/docker.sock ] ; do
4939
inotifywait -t 2 -e create $(dirname /var/run/docker.sock)
5040
done
5141

52-
# pull progrium/cedarish docker image
53-
docker pull progrium/cedarish
42+
# pull docker images
43+
docker pull deis/logger
44+
docker pull deis/server
45+
docker pull deis/worker
46+
docker pull deis/builder
47+
docker pull deis/database
48+
docker pull deis/registry
49+
docker pull deis/discovery
50+
docker pull deis/cache
51+
docker pull deis/data
5452

5553
# install chef 11.x deps
5654
apt-get install -yq ruby1.9.1 ruby1.9.1-dev make

0 commit comments

Comments
 (0)