From c01e409e853d0805fbf55469f5047cdddc4acf9f Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Sun, 4 Aug 2019 23:30:37 -0700
Subject: Pin NsJail version

---
 docker/base.Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'docker')

diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile
index 19fc1b8..14645d9 100644
--- a/docker/base.Dockerfile
+++ b/docker/base.Dockerfile
@@ -10,7 +10,8 @@ RUN apk add --no-cache --update  \
         linux-headers \
         make \
         protobuf-dev
-RUN git clone --depth=1 https://github.com/google/nsjail.git /nsjail
+RUN git clone --depth=1 https://github.com/google/nsjail.git /nsjail \
+    && git checkout 0b1d5ac03932c140f08536ed72b4b58741e7d3cf
 WORKDIR /nsjail
 RUN make
 
-- 
cgit v1.2.3


From 6610e6c8a6e3d2cfa9b6cb9bffb2b0ea8efb114d Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Sun, 4 Aug 2019 23:32:35 -0700
Subject: Update base image

---
 docker/base.Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docker')

diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile
index 14645d9..75680b6 100644
--- a/docker/base.Dockerfile
+++ b/docker/base.Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9.2 as builder
+FROM alpine:3.10 as builder
 RUN apk add --no-cache --update  \
         bison \
         bsd-compat-headers \
@@ -15,7 +15,7 @@ RUN git clone --depth=1 https://github.com/google/nsjail.git /nsjail \
 WORKDIR /nsjail
 RUN make
 
-FROM python:3.7.3-alpine3.9
+FROM python:3.7.4-alpine3.10
 ENV PIP_NO_CACHE_DIR=false
 RUN apk add --no-cache --update \
         libnl3 \
-- 
cgit v1.2.3


From a865f1cf1dc38526cea12fbe3a8b36199170e78f Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Sun, 4 Aug 2019 23:35:19 -0700
Subject: Base image: cd into cloned repo before checkout

---
 docker/base.Dockerfile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docker')

diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile
index 75680b6..9173542 100644
--- a/docker/base.Dockerfile
+++ b/docker/base.Dockerfile
@@ -11,6 +11,7 @@ RUN apk add --no-cache --update  \
         make \
         protobuf-dev
 RUN git clone --depth=1 https://github.com/google/nsjail.git /nsjail \
+    && cd /nsjail \
     && git checkout 0b1d5ac03932c140f08536ed72b4b58741e7d3cf
 WORKDIR /nsjail
 RUN make
-- 
cgit v1.2.3


From 2cd5efbdb9d077701ed9a0e5bb0a5106daef6fef Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Mon, 5 Aug 2019 10:35:39 -0700
Subject: Pin dependencies in base image

---
 docker/base.Dockerfile | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'docker')

diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile
index 9173542..de33a5e 100644
--- a/docker/base.Dockerfile
+++ b/docker/base.Dockerfile
@@ -1,15 +1,15 @@
 FROM alpine:3.10 as builder
 RUN apk add --no-cache --update  \
-        bison \
-        bsd-compat-headers \
-        flex \
-        g++ \
-        gcc \
-        git \
-        libnl3-dev \
-        linux-headers \
-        make \
-        protobuf-dev
+        bison~=3.3 \
+        bsd-compat-headers~=0.7 \
+        flex~=2.6 \
+        g++~=8.3 \
+        gcc~=8.3 \
+        git~=2.22 \
+        libnl3-dev~=3.4 \
+        linux-headers~=4.19 \
+        make~=4.2 \
+        protobuf-dev~=3.6
 RUN git clone --depth=1 https://github.com/google/nsjail.git /nsjail \
     && cd /nsjail \
     && git checkout 0b1d5ac03932c140f08536ed72b4b58741e7d3cf
@@ -19,9 +19,9 @@ RUN make
 FROM python:3.7.4-alpine3.10
 ENV PIP_NO_CACHE_DIR=false
 RUN apk add --no-cache --update \
-        libnl3 \
-        libstdc++ \
-        protobuf
-RUN pip install pipenv
+        libnl3~-3.4 \
+        libstdc++~=8.3 \
+        protobuf~=3.6
+RUN pip install pipenv==2018.11.26
 COPY --from=builder /nsjail/nsjail /usr/sbin/
 RUN chmod +x /usr/sbin/nsjail
-- 
cgit v1.2.3


From 7bd4856330df359a3d9ed067cd107d20985f1a7b Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Mon, 5 Aug 2019 10:38:30 -0700
Subject: Fix version specifier for libnl3

---
 docker/base.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docker')

diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile
index de33a5e..993e45d 100644
--- a/docker/base.Dockerfile
+++ b/docker/base.Dockerfile
@@ -19,7 +19,7 @@ RUN make
 FROM python:3.7.4-alpine3.10
 ENV PIP_NO_CACHE_DIR=false
 RUN apk add --no-cache --update \
-        libnl3~-3.4 \
+        libnl3~=3.4 \
         libstdc++~=8.3 \
         protobuf~=3.6
 RUN pip install pipenv==2018.11.26
-- 
cgit v1.2.3