Skip to content

Commit e301b43

Browse files
author
Peter Willis
committed
Update some provisioning files
1 parent ba7b339 commit e301b43

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

provision.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ export DEBIAN_FRONTEND=noninteractive
88
apt-get clean
99
rm -rf /var/lib/apt/lists/*
1010

11+
#cat > /etc/apt/apt.conf.d/docker-ignore-secure.conf <<EOFILE
12+
#Acquire::https::download.docker.com::Verify-Peer "false";
13+
#Acquire::https::download.docker.com::Verify-Host "false";
14+
#EOFILE
15+
16+
curl -k -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
17+
apt-key fingerprint 0EBFCD88
18+
19+
# --allow-unauthenticated
1120
apt-get update --fix-missing -y
1221

1322
# Upgrade all packages to the latest, and resolve dependencies
@@ -52,7 +61,7 @@ sudo timedatectl set-timezone US/Eastern
5261
(
5362
# Don't fail for the docker install
5463
set +e
55-
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
64+
curl -k -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
5665
apt-key fingerprint 0EBFCD88
5766
add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
5867
apt-get update
@@ -62,3 +71,4 @@ sudo timedatectl set-timezone US/Eastern
6271
usermod -a -G docker vagrant
6372
) || true
6473

74+
rm -f /etc/apt/apt.conf.d/docker-ignore-secure.conf

vagrant_up.bat

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ SETLOCAL
22

33
SET VAGRANT_HOME=C:\files\vagrant
44

5+
REM Uncomment the next two lines if you use a custom CA SSL certificate
6+
REM (if you get SSL errors when doing 'vagrant up', you may need this)
7+
REM SET SSL_CERT_FILE=c:\files\vagrant\customcacert.pem
8+
REM SET CURL_CA_BUNDLE=c:\files\vagrant\customcacert.pem
9+
510
PUSHD C:\files\vagrant\devbox
611

712
vagrant up

0 commit comments

Comments
 (0)