Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add yq to dockerfile and dockerfile.ci #375

Merged
merged 1 commit into from
Sep 17, 2019
Merged

Add yq to dockerfile and dockerfile.ci #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down