Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

Moby container runtime #3896

Merged
merged 22 commits into from
Oct 24, 2018
Merged

Moby container runtime #3896

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a5386ac
Create moby branch for VHD CI (#3895)
jackfrancis Sep 24, 2018
e811942
replace docker-engine w/ moby entirely
jackfrancis Sep 24, 2018
39113b8
enable versioned binary
jackfrancis Oct 15, 2018
0a962a5
install from storage blob
jackfrancis Oct 15, 2018
ac3cf99
new build
jackfrancis Oct 15, 2018
cdd1f4c
new deb package
jackfrancis Oct 16, 2018
80c339e
remove docker-engine entirely
jackfrancis Oct 17, 2018
0d8c2c5
CSE nit
jackfrancis Oct 17, 2018
ffcf8b7
undo version-based install
jackfrancis Oct 17, 2018
bcbd242
tmp filename
jackfrancis Oct 18, 2018
671f94d
error if moby install fails
jackfrancis Oct 18, 2018
3d90096
new URL
jackfrancis Oct 18, 2018
0c52dc8
enable docker-engine install
jackfrancis Oct 19, 2018
5bf4b1f
remove apt stuff
jackfrancis Oct 19, 2018
a1a94e8
restore “docker” user config option
jackfrancis Oct 22, 2018
952b055
two more
jackfrancis Oct 22, 2018
a4428b1
using explicit feature-flag condition
jackfrancis Oct 22, 2018
17da411
print feature flags
jackfrancis Oct 22, 2018
8ba839f
warning for dockerEngineVersion
jackfrancis Oct 22, 2018
a39ea5c
add moby note
jackfrancis Oct 22, 2018
19e3e76
actually pass along FEATURE_FLAGS
jackfrancis Oct 24, 2018
0ff376d
enable FEATURE_FLAGS={{user `feature_flags`}}
jackfrancis Oct 24, 2018
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
Prev Previous commit
Next Next commit
replace docker-engine w/ moby entirely
  • Loading branch information
@jackfrancis
jackfrancis committed Oct 23, 2018
commit e811942d2aafeee876145fcefb6f219098455b0b
2 changes: 1 addition & 1 deletion packer/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ installDeps

DOCKER_REPO="https://apt.dockerproject.org/repo"
DOCKER_ENGINE_VERSION="1.13.*"
installDocker
installMoby

installClearContainersRuntime

Expand Down
2 changes: 0 additions & 2 deletions parts/k8s/kubernetesinstalls.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ function installMoby() {
retrycmd_if_failure 10 5 10 cp /tmp/microsoft-prod.list /etc/apt/sources.list.d/ || exit $ERR_MOBY_APT_LIST_TIMEOUT
retrycmd_if_failure_no_stats 20 1 5 curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /tmp/microsoft.gpg || exit $ERR_MS_GPG_KEY_DOWNLOAD_TIMEOUT
retrycmd_if_failure 10 5 10 cp /tmp/microsoft.gpg /etc/apt/trusted.gpg.d/ || exit $ERR_MS_GPG_KEY_DOWNLOAD_TIMEOUT
apt_get_remove 10 5 10 docker-engine || exit $ERR_APT_UPDATE_TIMEOUT
echo { \"live-restore\": true, \"log-driver\": \"json-file\", \"log-opts\": { \"max-size\": \"50m\", \"max-file\": \"5\" } } > /etc/docker/daemon.json
apt_get_update || exit $ERR_APT_UPDATE_TIMEOUT
apt_get_install 20 30 120 moby-engine moby-cli || exit $ERR_MOBY_INSTALL_TIMEOUT
}
Expand Down