summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-12-12 14:41:49 -0500
committerMatthew Heon <matthew.heon@gmail.com>2018-12-12 14:41:49 -0500
commit4c68f3d0ab16f98affb96b90acd922f6e37e4789 (patch)
tree483078b8a5db546ab5c0a3d7c906a00481de904b
parentb7729cf3eb504680c98ee7703b4b22f00023ce91 (diff)
downloadpodman-4c68f3d0ab16f98affb96b90acd922f6e37e4789.tar.gz
podman-4c68f3d0ab16f98affb96b90acd922f6e37e4789.tar.bz2
podman-4c68f3d0ab16f98affb96b90acd922f6e37e4789.zip
Makefile tweaks to fix make shell
Also, bump the Dockerfile to use the latest Golang image, as most of our testing is now done on 1.11 Fixes: #1999 Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
-rw-r--r--Dockerfile2
-rw-r--r--Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 08af0f851..c227207bd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.10
+FROM golang:1.11
RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list
diff --git a/Makefile b/Makefile
index 55f34bcc0..55d5ddae3 100644
--- a/Makefile
+++ b/Makefile
@@ -165,7 +165,7 @@ integration.centos:
DIST=CentOS sh .papr_prepare.sh
shell: libpodimage
- ${CONTAINER_RUNTIME} run --tmpfs -e STORAGE_OPTIONS="--storage-driver=vfs" -e CGROUP_MANAGER=cgroupfs -e TESTFLAGS -e TRAVIS -it --privileged --rm -v ${CURDIR}:/go/src/${PROJECT} ${LIBPOD_IMAGE} sh
+ ${CONTAINER_RUNTIME} run -e STORAGE_OPTIONS="--storage-driver=vfs" -e CGROUP_MANAGER=cgroupfs -e TESTFLAGS -e TRAVIS -it --privileged --rm -v ${CURDIR}:/go/src/${PROJECT} ${LIBPOD_IMAGE} sh
testunit: libpodimage
${CONTAINER_RUNTIME} run -e STORAGE_OPTIONS="--storage-driver=vfs" -e TESTFLAGS -e CGROUP_MANAGER=cgroupfs -e TRAVIS -t --privileged --rm -v ${CURDIR}:/go/src/${PROJECT} ${LIBPOD_IMAGE} make localunit