Skip to content

Commit

Permalink
Use CircleCI's new Ubuntu 16.04 machine image (#1513)
Browse files Browse the repository at this point in the history
  • Loading branch information
rfay committed Apr 9, 2019
1 parent 60e0d25 commit a938096
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 26 deletions.
20 changes: 10 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
machine:
image: circleci/classic:201711-01
image: ubuntu-1604:201903-01
working_directory: ~/ddev
environment:
DRUD_NONINTERACTIVE: "true"
Expand Down Expand Up @@ -31,7 +31,7 @@ jobs:

lx_nginx_fpm_test:
machine:
image: circleci/classic:201711-01
image: ubuntu-1604:201903-01
working_directory: ~/ddev
environment:
DDEV_TEST_WEBSERVER_TYPE: nginx-fpm
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:

lx_apache_fpm_test:
machine:
image: circleci/classic:201711-01
image: ubuntu-1604:201903-01
working_directory: ~/ddev
environment:
DDEV_TEST_WEBSERVER_TYPE: apache-fpm
Expand Down Expand Up @@ -216,7 +216,7 @@ jobs:

lx_apache_cgi_test:
machine:
image: circleci/classic:201711-01
image: ubuntu-1604:201903-01
working_directory: ~/ddev
environment:
DDEV_TEST_WEBSERVER_TYPE: apache-cgi
Expand Down Expand Up @@ -246,7 +246,7 @@ jobs:

lx_nfsmount_test:
machine:
image: circleci/classic:201711-01
image: ubuntu-1604:201903-01
working_directory: ~/ddev
environment:
DDEV_TEST_USE_NFSMOUNT: true
Expand Down Expand Up @@ -278,7 +278,7 @@ jobs:

staticrequired:
machine:
image: circleci/classic:201711-01
image: ubuntu-1604:201903-01
working_directory: ~/ddev
environment:
ARTIFACTS: /artifacts
Expand All @@ -301,7 +301,7 @@ jobs:

lx_container_test:
machine:
image: circleci/classic:201711-01
image: ubuntu-1604:201903-01
working_directory: ~/ddev
steps:
- checkout
Expand Down Expand Up @@ -358,7 +358,7 @@ jobs:

artifacts:
machine:
image: circleci/classic:201711-01
image: ubuntu-1604:201903-01
working_directory: ~/ddev
environment:
ARTIFACTS: /artifacts
Expand All @@ -384,7 +384,7 @@ jobs:
# 'tag_build' automatically builds a tag .
tag_build:
machine:
image: circleci/classic:201711-01
image: ubuntu-1604:201903-01
working_directory: ~/ddev
environment:
DRUD_DEBUG: "true"
Expand Down Expand Up @@ -426,7 +426,7 @@ jobs:
# 'release_build' is used to push a full release.
release_build:
machine:
image: circleci/classic:201711-01
image: ubuntu-1604:201903-01
working_directory: ~/ddev
environment:
DRUD_DEBUG: "true"
Expand Down
17 changes: 1 addition & 16 deletions .circleci/linux_circle_vm_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,13 @@ if [ ! -d /home/linuxbrew/.linuxbrew/bin ] ; then
fi
export PATH=$PATH:/home/linuxbrew/.linuxbrew/bin
/home/linuxbrew/.linuxbrew/bin/brew update
for item in osslsigncode golang docker-compose; do
for item in osslsigncode golang; do
/home/linuxbrew/.linuxbrew/bin/brew install $item || /home/linuxbrew/.linuxbrew/bin/brew upgrade $item
done

sudo bash -c "printf '/home 10.0.0.0/255.0.0.0(rw,sync,no_subtree_check) 172.16.0.0/255.240.0.0(rw,sync,no_subtree_check) 192.168.0.0/255.255.0.0(rw,sync,no_subtree_check)\n/tmp 10.0.0.0/255.0.0.0(rw,sync,no_subtree_check) 172.16.0.0/255.240.0.0(rw,sync,no_subtree_check) 192.168.0.0/255.255.0.0(rw,sync,no_subtree_check)' >>/etc/exports"
sudo service nfs-kernel-server restart

# Remove existing docker and install from their apt package
sudo apt-get remove docker docker-engine docker.io
sudo apt-get install \
apt-transport-https \
ca-certificates \
curl \
software-properties-common
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
sudo add-apt-repository \
"deb [arch=amd64] https://download.docker.com/linux/ubuntu \
$(lsb_release -cs) \
stable"
sudo apt-get update -qq
sudo apt-get install -qq docker-ce

# gotestsum
GOTESTSUM_VERSION=0.3.2
curl -sSL "https://github.com/gotestyourself/gotestsum/releases/download/v$GOTESTSUM_VERSION/gotestsum_${GOTESTSUM_VERSION}_linux_amd64.tar.gz" | sudo tar -xz -C /usr/local/bin gotestsum && sudo chmod +x /usr/local/bin/gotestsum
Expand Down

0 comments on commit a938096

Please sign in to comment.