Skip to content

Fixed out of date docker config things #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jeffrey-P-McAteer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed out of date docker config things #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .vagrant/machines/default/virtualbox/action_provision
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.5:41eea388-2fa6-4a0b-a80e-09481a8bc2fd
1 change: 1 addition & 0 deletions .vagrant/machines/default/virtualbox/action_set_name
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1501514516
1 change: 1 addition & 0 deletions .vagrant/machines/default/virtualbox/creator_uid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1000
1 change: 1 addition & 0 deletions .vagrant/machines/default/virtualbox/id
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
41eea388-2fa6-4a0b-a80e-09481a8bc2fd
1 change: 1 addition & 0 deletions .vagrant/machines/default/virtualbox/index_uuid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cc880e1611d94a56b230b45cb0e434d9
27 changes: 27 additions & 0 deletions .vagrant/machines/default/virtualbox/private_key
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEA6dN0tF5GTWM+PK+kKMMTtL9pXSFlDrIA4bP9LBkfjXc7iAIh
E4YxWWgMz6YPy4gOj5ohWBwkqejaA0cWCa/otwXu4KvMIUk7+3zp36yV3tNdTpHf
fAuvkMWWCredZE8ZM7laOcv/+COpT1/+Jt7NkXUs0HI26AJnNwOIzHntMsMmDiAK
eO0LXdMfho2ub6w8JtoTBd2zEkX0WIXQUDi3yuReMe9r/Rx28B/lB/+jy0AaLC/z
86MjSNtMWjTz7qeGFqG6gbdT1obFjTr88Fpkn5+A3cot2R4knvWDx2exenamyp4d
Ctr/HX1+L2iV8ZYf2S+rHk8sKuEULQyIWeo5/wIDAQABAoIBAFTsAYTIgIv2sVHl
EJ/lSbDpm+DBEizmJT/T2O09KqJ8XVimPVET+bRY/94il7X58h/hgJ65ie9TrGpo
VO6rvr9KHlnmyzqDmI9b7KzZx4yoA0lX3Wz16YuQ10+JJFacC7EnbkdzecGrYgB8
Apgnb02W2vHRqXNV/BqU5AgveCBo4h+rVlU8MvS/fcIsyBvE00q6s0EOSoExeEcZ
IknBfUTJT/05l2tNHK2kr7fCfhdOUZMC/YlAAODLSJu8Scy+MbWeJ3m89bJF9SqL
i+XAeIqDvcqXfanEUNWOqouYO8coO24GJjZHPc19nBelo2OI3cCaU+HVL1T2tBYa
IsymMOECgYEA9Pp5gMtbZeT+wUTSuN0yy/nQnPfcoW75TcRaT/ua6v04pb/HBZnT
+RSYoDB9k+xMXHlwJnr8phLkGfPTLaZNDeCfK5Md6PwIJ9isl7SGV6pO1cyAJAQc
ImvBVv9oWC+3TMHm4sSlRZ0PUN/FME4ecc/QtFhBwnovlHZj3vqwiIkCgYEA9FiI
rkiBZ1av5uWdgggg3ehEW57c3vbIePhEGEBxEWt9P7M2AmVisScUxhhs5aA444V8
BCYu0rqp+sMVdZAijuKoOQThOf08/hx9HhVicu4rpRV91WsRQNdAIkJ4uC7DBhMc
J1yWQ6Lang6ispHu9wHG2xvpei/47Mk95NHCfEcCgYBrbFJPWd0QR2Q217kXe1fE
/hyuWDoVSBZmNY3suMXr+XIXrIrXN+ctuAxdYiYO8XVir5WwKgoTwQDpKHQX9m6f
gToK344kFjB1WJwGQhEO7A15zxz5rhuwNFQplAHrebEFJZnbIqPebMrEiftr/TV4
bspz6qebYfzvOyL8Ki2zEQKBgQCcV22U/iV2RnwkY/TE94h4FB5w9RPjwcmBxXBk
iA8Qk1M/h95d6BseuJ/NJGHBByR/R7CTQw8gnHkYTuyTHVdPT21Nlna50PPOr9HK
hupIGWZpqXerL2eJsnCBu0BcsObuIxoXgWFQA4qYKUsmsMNS3psrJQ/ds4Y1k4n7
t88WDwKBgQDlQPQk4GSfTX9MmprQEvg8YMzJBv7ZbZJHxhX+bCxQOEi2m9Zvo+4E
6eAjfKu+i0jWJ2bhlj6clvbgv32X+X/neXtrVUdE8/ofe8g52COcPW+kL5hQGTS+
4EKkYRIIlTfdfCKmCwJv3if8/2SwXQ7y0tVTkdZgY/FeLxPnZq7ztQ==
-----END RSA PRIVATE KEY-----
1 change: 1 addition & 0 deletions .vagrant/machines/default/virtualbox/synced_folders
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"virtualbox":{"/vagrant":{"guestpath":"/vagrant","hostpath":"/j/projects/bfdocker","disabled":false,"__vagrantfile":true}}}
1 change: 1 addition & 0 deletions .vagrant/machines/default/virtualbox/vagrant_cwd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/j/projects/bfdocker
3 changes: 3 additions & 0 deletions Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
bc.path = "./scripts/vagrant-provision-client.sh"
BC_ARGS = ENV["BES_CLIENT"]
bc.args = BC_ARGS
else
# Cannot have a shell command w/o program to run.
bc.inline = "echo bugfixes for bigfixes"
end
end
end
Expand Down
14 changes: 9 additions & 5 deletions scripts/vagrant-provision-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,15 @@ then

# change the docker config to allocate 20G to containers
# see https://docs.docker.com/articles/systemd/ for info on configuration
mkdir -p /etc/systemd/system/docker.service.d
echo '[Service]' > /etc/systemd/system/docker.service.d/docker.conf
echo 'ExecStart=' >> /etc/systemd/system/docker.service.d/docker.conf
echo "ExecStart=/usr/bin/docker -d -s=devicemapper --storage-opt dm.basesize=20G -H fd:// " \
>> /etc/systemd/system/docker.service.d/docker.conf
#mkdir -p /etc/systemd/system/docker.service.d
#echo '[Service]' > /etc/systemd/system/docker.service.d/docker.conf
#echo 'ExecStart=' >> /etc/systemd/system/docker.service.d/docker.conf
#echo "ExecStart=/usr/bin/docker -d -s=devicemapper --storage-opt dm.basesize=20G -H fd:// " \
# >> /etc/systemd/system/docker.service.d/docker.conf

## ^ No longer works, must run dockerd instead of docker -d
sed -i 's/bin\/dockerd/bin\/dockerd --storage-driver=devicemapper --storage-opt dm.basesize=20G/g' /usr/lib/systemd/system/docker.service

systemctl daemon-reload
fi
# Start docker and set to start on boot
Expand Down