Merge pull request #375 from deepmind/issue_374

Add yq to dockerfile and dockerfile.ci
kapicorp · Sep 17, 2019 · 07d24ff · 07d24ff
2 parents 88d5e48 + a39ed19
commit 07d24ff
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.24.1-rc.3:
+- Add yq to the docker images (#375)
+
 ## 0.24.1-rc.2:
 - Update all Dockerfiles to use multi-stage builds (#370)
 

diff --git a/Dockerfile b/Dockerfile
@@ -24,7 +24,7 @@ RUN apt-get update \
     && apt-get install --no-install-recommends -y \
         build-essential \
     && python -m venv /opt/venv \
-    && pip install --upgrade pip \
+    && pip install --upgrade pip yq \
     && pip install -r requirements.txt \
     && ./kapitan/inputs/helm/build.sh \
     && pip install .

diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -60,7 +60,7 @@ RUN apt-get update \
     # Metrics namespace for server side analytics
     && gcloud config set metrics/environment github_docker_image \
     && python -m venv /opt/venv \
-    && pip install --upgrade pip \
+    && pip install --upgrade pip yq \
     && pip install -r ./kapitan/requirements.txt \
     && ./kapitan/kapitan/inputs/helm/build.sh \
     && pip install ./kapitan \