Skip to content

Libsystemd dev + newer runc #2991

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

Merged
openshift-merge-robot merged 4 commits into from
Apr 26, 2019
Merged

Libsystemd dev + newer runc #2991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d1f8b0
Cirrus: Install libsystemd-dev on Ubuntu
cevich Apr 23, 2019
6fa7288
Cirrus: fix obsolete Ubuntu package
cevich Apr 23, 2019
c008cf5
Cirrus: Bump up runc commit
cevich Apr 23, 2019
4072f27
Cirrus: Use freshly built images
cevich Apr 23, 2019
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
18 changes: 9 additions & 9 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ env:
#### Cache-image names to test with
###
ACTIVE_CACHE_IMAGE_NAMES: >-
fedora-28-libpod-6318419153518592
fedora-29-libpod-6318419153518592
ubuntu-18-libpod-6318419153518592
rhel-7-libpod-6318419153518592
fedora-29-libpod-548c1c05
fedora-28-libpod-548c1c05
ubuntu-18-libpod-548c1c05
rhel-7-libpod-548c1c05
image-builder-image-1541772081
FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-6318419153518592"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-6318419153518592"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-6318419153518592"
PRIOR_RHEL_CACHE_IMAGE_NAME: "rhel-7-libpod-6318419153518592"
FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-548c1c05"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-548c1c05"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-548c1c05"
PRIOR_RHEL_CACHE_IMAGE_NAME: "rhel-7-libpod-548c1c05"
# RHEL_CACHE_IMAGE_NAME: "rhel-8-notready"
# CENTOS_CACHE_IMAGE_NAME: "centos-7-notready"

Expand All @@ -49,7 +49,7 @@ env:
CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9"
CRIO_COMMIT: "7a283c391abb7bd25086a8ff91dbb36ebdd24466"
CRIU_COMMIT: "c74b83cd49c00589c0c0468ba5fe685b67fdbd0a"
RUNC_COMMIT: "25f3f893c86d07426df93b7aa172f33fdf093fbd"
RUNC_COMMIT: "029124da7af7360afa781a0234d1b083550f797c"
# CSV of cache-image names to build (see $PACKER_BASE/libpod_images.json)
PACKER_BUILDS: "ubuntu-18,fedora-29,fedora-28,rhel-7" # TODO: rhel-8,centos-7
# Version of packer to use
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RUN apt-get update && apt-get install -y \
&& apt-get clean

# Install runc
ENV RUNC_COMMIT 96ec2177ae841256168fcf76954f7177af9446eb
ENV RUNC_COMMIT 029124da7af7360afa781a0234d1b083550f797c
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \
Expand Down
3 changes: 2 additions & 1 deletion contrib/cirrus/packer/ubuntu_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ ooe.sh sudo -E apt-get -qq install \
gettext \
go-md2man \
golang \
iproute \
iproute2 \
iptables \
libaio-dev \
libapparmor-dev \
Expand All @@ -68,6 +68,7 @@ ooe.sh sudo -E apt-get -qq install \
libprotobuf-dev \
libseccomp-dev \
libseccomp2 \
libsystemd-dev \
libtool \
libudev-dev \
lsof \
Expand Down