diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-12-12 14:13:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-12 14:13:20 -0800 |
| commit | 62346b6f06c1794ddd18f7bc9170e988759a51d2 (patch) | |
| tree | 483078b8a5db546ab5c0a3d7c906a00481de904b | |
| parent | b7729cf3eb504680c98ee7703b4b22f00023ce91 (diff) | |
| parent | 4c68f3d0ab16f98affb96b90acd922f6e37e4789 (diff) | |
| download | podman-62346b6f06c1794ddd18f7bc9170e988759a51d2.tar.gz podman-62346b6f06c1794ddd18f7bc9170e988759a51d2.tar.bz2 podman-62346b6f06c1794ddd18f7bc9170e988759a51d2.zip | |
Merge pull request #2001 from mheon/fix_make_shell
Makefile tweaks to fix make shell
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Makefile | 2 |
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 @@ -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 |