Skip to content

Commit 29ba038

Browse files
committed
Specified package version 0.6.4 for Docker, not virtual package.
1 parent 1838ae3 commit 29ba038

4 files changed

Lines changed: 19 additions & 8 deletions

File tree

contrib/digitalocean/prepare-digitalocean-snapshot.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
THIS_DIR=$(cd $(dirname $0); pwd) # absolute path
1515
CONTRIB_DIR=$(dirname $THIS_DIR)
1616

17+
# Remove old kernel(s)
18+
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
19+
1720
# upgrade to latest packages
1821
apt-get update
1922
apt-get upgrade -yq
@@ -36,12 +39,11 @@ apt-get update
3639
apt-get -qy upgrade
3740

3841
# install required packages
39-
apt-get install lxc-docker curl git make python-setuptools python-pip -yq
42+
apt-get install lxc-docker-0.6.4 curl git make python-setuptools python-pip -yq
4043

4144
# create buildstep docker image
4245
git clone -b deis https://github.com/opdemand/buildstep.git
4346
cd buildstep
44-
git checkout deis
4547
make
4648
cd ..
4749
rm -rf buildstep

contrib/ec2/prepare-ubuntu-ami.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
# 6. Distribute the AMI to other regions using `ec2-copy-image`
1515
# 7. Create/update your Deis flavors to use your new AMIs
1616
#
17+
18+
# Remove old kernel(s)
19+
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
20+
1721
apt-get install python-software-properties -y
1822

1923
# Add the Docker repository key to your local keychain
@@ -28,7 +32,7 @@ apt-get update
2832
apt-get dist-upgrade -yq
2933

3034
# install required packages
31-
apt-get install lxc-docker curl git make python-setuptools python-pip -yq
35+
apt-get install lxc-docker-0.6.4 curl git make python-setuptools python-pip -yq
3236

3337
# create buildstep docker image
3438
git clone -b deis https://github.com/opdemand/buildstep.git

contrib/rackspace/prepare-rackspace-image.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
# 6. Distribute the image to other regions
1616
# 7. Create/update your Deis flavors to use your new images
1717
#
18+
19+
# Remove old kernel(s)
20+
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
21+
1822
apt-get install python-software-properties -y
1923

2024
# Add the Docker repository key to your local keychain
@@ -29,12 +33,11 @@ apt-get update
2933
apt-get dist-upgrade -yq
3034

3135
# install required packages
32-
apt-get install lxc-docker curl git make python-setuptools python-pip -yq
36+
apt-get install lxc-docker-0.6.4 curl git make python-setuptools python-pip -yq
3337

3438
# create buildstep docker image
3539
git clone -b deis https://github.com/opdemand/buildstep.git
3640
cd buildstep
37-
git checkout deis
3841
make
3942
cd ..
4043
rm -rf buildstep

contrib/vagrant/prepare-ubuntu-box.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
# 5. Create a new box with `vagrant package && cp -f package.box contrib/vagrant/deis-base.box`
1515
#
1616

17+
# Remove old kernel(s)
18+
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
19+
1720
# Remove any temporary work files, including the postinstall.sh script
1821
rm -f /home/${account}/{*.iso,postinstall*.sh}
1922

@@ -32,12 +35,11 @@ apt-get update
3235
apt-get dist-upgrade -yq
3336

3437
# install required packages
35-
apt-get install lxc-docker git make python-setuptools python-pip -yq
38+
apt-get install lxc-docker-0.6.4 git make python-setuptools python-pip -yq
3639

3740
# create buildstep docker image
38-
git clone https://github.com/opdemand/buildstep.git
41+
git clone -b deis https://github.com/opdemand/buildstep.git
3942
cd buildstep
40-
git checkout deis
4143
make
4244
cd ..
4345
rm -rf buildstep

0 commit comments

Comments
 (0)