mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-11-27 20:31:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3 from Bugagazavr/exp-vagrant

Browse source 
Vagrant
This commit is contained in:
Brad Rydzewski 2014-07-31 20:29:14 -07:00
commit f508c27001
2 changed files with 87 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
Vagrantfile vendored Normal file
View file

@ -0,0 +1,85 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Drone supports 12.04 64bit and 13.04 64bit
config.vm.box = "precise64"
config.vm.box_url = "http://files.vagrantup.com/precise64.box"
# Forward keys from SSH agent rather than copypasta
config.ssh.forward_agent = true
# FIXME: Maybe this is enough
config.vm.provider "virtualbox" do |v|
v.customize ["modifyvm", :id, "--memory", "2048"]
end
# Drone by default runs on port 80. Forward from host to guest
config.vm.network :forwarded_port, guest: 8080, host: 8080
config.vm.network :private_network, ip: "192.168.10.101"
# Sync this repo into what will be $GOPATH
config.vm.synced_folder ".", "/opt/go/src/github.com/drone/drone"
# system-level initial setup
config.vm.provision "shell", inline: <<-EOF
set -e
# System packages
echo "Installing Base Packages"
export DEBIAN_FRONTEND=noninteractive
sudo apt-get update -qq
sudo apt-get install -qqy --force-yes build-essential bzr git mercurial vim
# Install Go
GOVERSION="1.3"
GOTARBALL="go${GOVERSION}.linux-amd64.tar.gz"
export GOROOT=/usr/local/go
export GOPATH=/opt/go
export PATH=$PATH:$GOROOT/bin:$GOPATH/bin
echo "Installing Go $GOVERSION"
if [ ! $(which go) ]; then
echo " Downloading $GOTARBALL"
wget --quiet --directory-prefix=/tmp http://golang.org/dl/$GOTARBALL
echo " Extracting $GOTARBALL to $GOROOT"
sudo tar -C /usr/local -xzf /tmp/$GOTARBALL
echo " Configuring GOPATH"
sudo mkdir -p $GOPATH/src $GOPATH/bin $GOPATH/pkg
sudo chown -R vagrant $GOPATH
echo " Configuring env vars"
echo "export PATH=\$PATH:$GOROOT/bin:$GOPATH/bin" | sudo tee /etc/profile.d/golang.sh > /dev/null
echo "export GOROOT=$GOROOT" | sudo tee --append /etc/profile.d/golang.sh > /dev/null
echo "export GOPATH=$GOPATH" | sudo tee --append /etc/profile.d/golang.sh > /dev/null
fi
# Install drone
echo "Building Drone"
cd $GOPATH/src/github.com/drone/drone
make deps
# Auto cd to drone install dir
echo "cd /opt/go/src/github.com/drone/drone" >> /home/vagrant/.bashrc
# Cleanup
sudo apt-get autoremove
EOF
config.vm.provision "shell", inline: <<-EOF
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
sudo sh -c 'echo deb http://get.docker.io/ubuntu docker main' > /etc/apt/sources.list.d/docker.list
sudo apt-get update
sudo apt-get install -y linux-image-generic-lts-raring linux-headers-generic-lts-raring
sudo apt-get install -y lxc-docker-0.9.0
EOF
end

4
shared/build/docker/image.go
View file

@ -10,7 +10,7 @@ import (
"time"
"github.com/dotcloud/docker/archive"
"github.com/dotcloud/docker/utils"
"github.com/dotcloud/docker/pkg/parsers"
)
type Images struct {
@ -63,7 +63,7 @@ func (c *ImageService) Create(image string) error {
}
func (c *ImageService) Pull(image string) error {
name, tag := utils.ParseRepositoryTag(image)
name, tag := parsers.ParseRepositoryTag(image)
if len(tag) == 0 {
tag = DEFAULTTAG
}