Skip to content
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

Jump to bottom

Add RPM packaging for 18.09.x #131

Merged
merged 11 commits into from
Aug 16, 2018
Merged

Add RPM packaging for 18.09.x #131

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2a27fb1
Add RPM package building for docker-ce-cli
seemethere Aug 6, 2018
111b5ba
Remove engine-$(ARCH).tar dependency for now
seemethere Aug 13, 2018
ca519bb
Add containerd-proxy building
seemethere Aug 14, 2018
5513629
Add containerd-shim-process installation
seemethere Aug 14, 2018
c245ce1
Remove rpmlint checks, add BuildRequires
seemethere Aug 14, 2018
481c395
Add systemd files, add containerd-proxy config
seemethere Aug 14, 2018
f99ffa4
Round out systemd for RPM packaging
seemethere Aug 15, 2018
df2a0d6
Update to use a base golang image instead of curl
seemethere Aug 15, 2018
558cd9c
Revive pre / post steps, update offline location
seemethere Aug 15, 2018
2134ee5
Improve containerd detection, don't rely on root
seemethere Aug 16, 2018
86dafe5
Some changes to get this working on CentOS 7
seemethere Aug 16, 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
Some changes to get this working on CentOS 7 
Old versions of things on CentOS 7 strike again!

infinity is not a thing for TimeoutSec on systemd < 229

Signed-off-by: Eli Uriegas <[email protected]>
  • Loading branch information
@seemethere
seemethere committed Aug 16, 2018
commit 86dafe5391e2ef298248536cd038e27230a4df63
4 changes: 1 addition & 3 deletions systemd/docker.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ Wants=network-online.target containerd.service
# Install containerd-shim-process if it's not already installed
ExecStartPre=/usr/libexec/containerd-offline-installer /var/lib/containerd-offline-installer/containerd-shim-process.tar docker.io/docker/containerd-shim-process
ExecStart=/usr/bin/dockerd
TimeoutSec=infinity
KillMode=process
TimeoutSec=0
Restart=always
Delegate=yes
# On RPM Based distributions PATH isn't defined so we define it here
# /opt/containerd/bin is in front so dockerd grabs the correct runc binary
Environment="PATH=/opt/containerd/bin:/sbin:/usr/bin:/usr/local/bin:$PATH"
Expand Down