summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-04-26 09:00:45 -0700
committerGitHub <noreply@github.com>2019-04-26 09:00:45 -0700
commita85155617fb1ed4248adb2169845f4a08ab88789 (patch)
tree993ed425a4a176e8e617c70fe5519f89aba7fbfd
parent135c8bef223d32f553659cbdfd5eb99f948a6c84 (diff)
parent4072f2738bcb1caaf80e52380f0691ab16f8170b (diff)
downloadpodman-a85155617fb1ed4248adb2169845f4a08ab88789.tar.gz
podman-a85155617fb1ed4248adb2169845f4a08ab88789.tar.bz2
podman-a85155617fb1ed4248adb2169845f4a08ab88789.zip
Merge pull request #2991 from cevich/libsystemd_dev
Libsystemd dev + newer runc
-rw-r--r--.cirrus.yml18
-rw-r--r--Dockerfile2
-rw-r--r--contrib/cirrus/packer/ubuntu_setup.sh3
3 files changed, 12 insertions, 11 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 325176179..0102dcb1a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -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"
@@ -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
diff --git a/Dockerfile b/Dockerfile
index 83cd3fccd..767e64570 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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" \
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index 24f1cce21..e84566ce3 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -49,7 +49,7 @@ ooe.sh sudo -E apt-get -qq install \
gettext \
go-md2man \
golang \
- iproute \
+ iproute2 \
iptables \
libaio-dev \
libapparmor-dev \
@@ -68,6 +68,7 @@ ooe.sh sudo -E apt-get -qq install \
libprotobuf-dev \
libseccomp-dev \
libseccomp2 \
+ libsystemd-dev \
libtool \
libudev-dev \
lsof \