aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2021-11-15 17:31:44 -0800
committerDan Willemsen <dwillemsen@google.com>2021-11-15 22:51:39 -0800
commitcb69a4e2f286172d29f28bbc397fd940ac05d5b7 (patch)
tree04efa3e48705b411d0d0cfcef5edc102f26a3b02
parent0632049086037a1c3225c5e006e05339e5f0d2b4 (diff)
downloadkati-cb69a4e2f286172d29f28bbc397fd940ac05d5b7.tar.gz
Update Dockerfile to pass tests
Also moves the source outside of the root directory, and changes ENTRYPOINT to CMD to make it easier to enter the container and inspect the test results. Use -j8 to speed up builds, that should be fairly safe on most modern machines.
-rw-r--r--Dockerfile9
1 files changed, 5 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index 9cd4975..b4423be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
-RUN apt-get update && apt-get install -y make git-core build-essential curl ninja-build python
+RUN apt-get update && apt-get install -y make git-core build-essential curl ninja-build python python3
# Install Go
RUN \
@@ -13,6 +13,7 @@ ENV GOPATH /gopath
ENV PATH $GOROOT/bin:$GOPATH/bin:$PATH
# Copy project code.
-COPY . /
+COPY . /src
+WORKDIR /src
-ENTRYPOINT make test
+CMD make test -j8