lib/kontena/machine/vagrant/Vagrantfile.master.rb.erb in krates-plugin-vagrant-0.3.5 vs lib/kontena/machine/vagrant/Vagrantfile.master.rb.erb in krates-plugin-vagrant-0.3.6
- old
+ new
@@ -9,11 +9,10 @@
write_files:
- path: /etc/krates-server.env
permissions: 0600
owner: root
content: |
- KONTENA_VERSION=<%= version %>
KRATES_VAULT_KEY=<%= vault_secret %>
KRATES_VAULT_IV=<%= vault_iv %>
coreos:
update:
reboot-strategy: off
@@ -67,19 +66,19 @@
TimeoutStartSec=0
EnvironmentFile=/etc/krates-server.env
ExecStartPre=-/usr/bin/docker stop krates-server-api
ExecStartPre=-/usr/bin/docker rm krates-server-api
ExecStartPre=-/usr/bin/docker network create krates
- ExecStartPre=/usr/bin/docker pull krates/master:${KONTENA_VERSION}
+ ExecStartPre=/usr/bin/docker pull quay.io/krates/master
ExecStart=/usr/bin/docker run --name krates-server-api \
-e MONGODB_URI=mongodb://krates-server-mongo:27017/krates_server \
-e VAULT_KEY=${KRATES_VAULT_KEY} -e VAULT_IV=${KRATES_VAULT_IV} \
<% if server_name %>-e SERVER_NAME=<%= server_name %><% end %> \
<% if initial_admin_code %>-e INITIAL_ADMIN_CODE=<%= initial_admin_code %><% end %> \
--network krates \
-p 8080:9292 \
- krates/master:${KONTENA_VERSION}
+ quay.io/krates/master
ExecStop=/usr/bin/docker stop krates-server-api
INIT
cloud_init_file = Tempfile.new('krates-master')
File.write(cloud_init_file.path, cloud_init)
@@ -104,9 +103,10 @@
vb.gui = false
vb.memory = <%= memory %>
vb.auto_nat_dns_proxy = false
vb.customize ["modifyvm", :id, "--natdnsproxy1", "off" ]
vb.customize ["modifyvm", :id, "--natdnshostresolver1", "off" ]
+ vb.customize ["modifyvm", :id, "--autostart-enabled", "on" ]
end
docker.vm.provision :file, :source => cloud_init_file.path, :destination => "/tmp/vagrantfile-user-data"
docker.vm.provision :shell, :inline => "mv /tmp/vagrantfile-user-data /var/lib/coreos-vagrant/", :privileged => true
end
end