summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2019-01-11 13:59:16 -0600
committerbaude <bbaude@redhat.com>2019-01-11 14:01:57 -0600
commite10baba32673d4b6d9ada129941428fc8f8304eb (patch)
tree27c75727f7233e842b88d901903a316c18f11150 /Makefile
parent28c35cab8750f379a418e87ed6bd874a12ec158d (diff)
downloadpodman-e10baba32673d4b6d9ada129941428fc8f8304eb.tar.gz
podman-e10baba32673d4b6d9ada129941428fc8f8304eb.tar.bz2
podman-e10baba32673d4b6d9ada129941428fc8f8304eb.zip
podman play kube: add containers to pod
when defining containers, we missed the conditional logic to allow the container to be defined with "WithPod" and so forth. I had to slightly modify the createcontainer process to pass a libpod.Pod that could override things; use nil as no pod. Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 73dc79400..ff7668cf2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
GO ?= go
DESTDIR ?= /
-EPOCH_TEST_COMMIT ?= e1732a5213147e3c0b7bf60b55a332c3720ecb4b
+EPOCH_TEST_COMMIT ?= bd40dcfc2bc7c9014ea1f33482fb63aacbcdfe87
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD