Commit cc4974ca by Tsubasa Namiki

Fixed bugs

and change port
parent 7ace9563
...@@ -11,9 +11,9 @@ VAGRANTFILE_API_VERSION = "2" ...@@ -11,9 +11,9 @@ VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.define :docker, primary: true do |docker| config.vm.define :restyaboard, primary: true do |restyaboard|
docker.vm.provider :aws do |provider, override| restyaboard.vm.provider :aws do |provider, override|
override.vm.hostname = "docker" override.vm.hostname = "restyaboard"
override.vm.box_url = "https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box" override.vm.box_url = "https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box"
override.vm.box = "aws" override.vm.box = "aws"
override.ssh.username = ENV['AWS_SSH_USERNAME'] override.ssh.username = ENV['AWS_SSH_USERNAME']
...@@ -30,7 +30,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| ...@@ -30,7 +30,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
provider.instance_ready_timeout = 120 provider.instance_ready_timeout = 120
provider.terminate_on_shutdown = false provider.terminate_on_shutdown = false
provider.security_groups = [ENV['AWS_SECURITY_GROUP']] provider.security_groups = [ENV['AWS_SECURITY_GROUP']]
provider.tags = {"Name" => "docker"} provider.tags = {"Name" => "restyaboard"}
# synced folder # synced folder
override.vm.synced_folder ".", "/vagrant", disabled: true override.vm.synced_folder ".", "/vagrant", disabled: true
......
...@@ -26,7 +26,7 @@ restyaboard: ...@@ -26,7 +26,7 @@ restyaboard:
- elasticsearch:elasticsearch - elasticsearch:elasticsearch
- postgres:postgres - postgres:postgres
ports: ports:
- 5555:80 - 1234:80
volumes_from: volumes_from:
- data00restyaboard - data00restyaboard
restart: always restart: always
--- ---
recipes: recipes:
- roles/base.rb - roles/base.rb
- roles/docker.rb - roles/restyaboard.rb
\ No newline at end of file \ No newline at end of file
...@@ -12,7 +12,7 @@ git "/home/ec2-user/docker-restyaboard" do ...@@ -12,7 +12,7 @@ git "/home/ec2-user/docker-restyaboard" do
end end
execute "docker up" do execute "docker up" do
command "COMPOSE_API_VERSION=1.18 docker-compose build" command "COMPOSE_API_VERSION=1.18 /usr/local/bin/docker-compose up -d"
cwd "/home/ec2-user/docker-restyaboard" cwd "/home/ec2-user/docker-restyaboard"
user "ec2-user" user "ec2-user"
not_if "docker ps | grep restyaboard" not_if "docker ps | grep restyaboard"
......
...@@ -3,4 +3,8 @@ require 'spec_helper' ...@@ -3,4 +3,8 @@ require 'spec_helper'
describe service('docker') do describe service('docker') do
it { should be_enabled } it { should be_enabled }
it { should be_running } it { should be_running }
end
describe port(1234) do
it { should be_listening }
end end
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment