summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-04-04 13:34:19 -0700
committerGitHub <noreply@github.com>2019-04-04 13:34:19 -0700
commitfd39849beef3cdc6cce08814aaa1e12f60b37951 (patch)
tree8e6b5198314c0976c724ced8d83c577d2d4ecb6b
parentbf3593ef8d57b2b6e187a5c1cccf7cb9770182ec (diff)
parent6f928057b44bd00b7a37c61a014007c9c57e7866 (diff)
downloadpodman-fd39849beef3cdc6cce08814aaa1e12f60b37951.tar.gz
podman-fd39849beef3cdc6cce08814aaa1e12f60b37951.tar.bz2
podman-fd39849beef3cdc6cce08814aaa1e12f60b37951.zip
Merge pull request #2838 from openSUSE/golang-1.12
Update Dockerfile to use golang:1.12 image
-rw-r--r--Dockerfile17
1 files changed, 3 insertions, 14 deletions
diff --git a/Dockerfile b/Dockerfile
index 28e0b88cb..83cd3fccd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,4 @@
-FROM golang:1.11
-
-RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list
+FROM golang:1.12
RUN apt-get update && apt-get install -y \
apparmor \
@@ -23,6 +21,8 @@ RUN apt-get update && apt-get install -y \
libostree-dev \
libprotobuf-dev \
libprotobuf-c0-dev \
+ libseccomp2 \
+ libseccomp-dev \
libtool \
libudev-dev \
protobuf-c-compiler \
@@ -43,17 +43,6 @@ RUN apt-get update && apt-get install -y \
--no-install-recommends \
&& apt-get clean
-ENV LIBSECCOMP_COMMIT release-2.3
-RUN set -x \
- && git clone https://github.com/seccomp/libseccomp "$GOPATH/src/github.com/seccomp/libseccomp" \
- && cd "$GOPATH/src/github.com/seccomp/libseccomp" \
- && git fetch origin --tags \
- && git checkout -q "$LIBSECCOMP_COMMIT" \
- && ./autogen.sh \
- && ./configure --prefix=/usr \
- && make all \
- && make install
-
# Install runc
ENV RUNC_COMMIT 96ec2177ae841256168fcf76954f7177af9446eb
RUN set -x \