aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCole Faust <colefaust@google.com>2024-01-19 15:48:22 -0800
committerCole Faust <colecfaust@gmail.com>2024-01-19 15:51:21 -0800
commit1ec8253207f5b2aada23988ede917d27195fee38 (patch)
treec4ab32ba3306cd2e6a3a659b88449ff4f70cd11c
parente37cedd24e76b59887f2153ca56dc6d4e8065d72 (diff)
downloadkati-1ec8253207f5b2aada23988ede917d27195fee38.tar.gz
Install a specific version of ninja in the dockerfile
It was different from what is installed in the github action.
-rw-r--r--Dockerfile12
1 files changed, 10 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 834e6c0..da61f8e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
FROM ubuntu:22.04
-RUN apt-get update && apt-get install -y make git-core build-essential curl ninja-build python3 wget
+RUN apt-get update && apt-get install -y make git-core build-essential curl python3 wget unzip
# Install Go
RUN \
@@ -18,10 +18,18 @@ RUN \
cd .. && \
rm -rf tmp/
+# Install ninja, we need a newer version than is in apt
+RUN \
+ mkdir -p /ninja && \
+ cd /ninja && \
+ wget https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-linux.zip && \
+ unzip ninja-linux.zip && \
+ rm ninja-linux.zip
+
# Set environment variables for Go and Make.
ENV GOROOT /goroot
ENV GOPATH /gopath
-ENV PATH $GOROOT/bin:$GOPATH/bin:/make:$PATH
+ENV PATH $GOROOT/bin:$GOPATH/bin:/make:/ninja:$PATH
# Copy project code.
COPY . /src