Skip to content

Commit

Permalink
Merge branch 'update-tools'
Browse files Browse the repository at this point in the history
  • Loading branch information
HighwayofLife committed Jul 14, 2020
2 parents 606c811 + d498343 commit 9fed382
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
v2.1
----

* Updated base Python to 3.8.4-alpine3.12
* Updated Kubectl to v1.18.5
* Updated Kustomize to 3.8.0
* Updated Conftest to 0.19.0
* Updated Conftest to new home at open-policy-agent

v2.0
----

Expand All @@ -7,4 +16,3 @@ v2.0
* Updated YamlLint to v1.23
* Updated Kustomize to v3.5.4
* Added ConfTest v0.18.1

15 changes: 8 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
FROM python:3.8.2-alpine3.11
FROM python:3.8.4-alpine3.12
# https://hub.docker.com/_/python

ARG APP_VERSION=2.0
ARG APP_VERSION=2.1

# https://github.com/kubernetes/kubectl/releases
ARG KUBECTL_VERSION=1.18.2
ARG KUBECTL_VERSION=1.18.5

# https://github.com/instrumenta/kubeval/releases
ARG KUBEVAL_VERSION=0.15.0
Expand All @@ -12,10 +13,10 @@ ARG KUBEVAL_VERSION=0.15.0
ARG YAMLLINT_VERSION=1.23.0

# https://github.com/kubernetes-sigs/kustomize/releases
ARG KUSTOMIZE_VERSION=3.5.4
ARG KUSTOMIZE_VERSION=3.8.0

# https://github.com/instrumenta/conftest/releases
ARG CONFTEST_VERSION=0.18.1
# https://github.com/open-policy-agent/conftest/releases
ARG CONFTEST_VERSION=0.19.0

# split layers into distinct components
RUN apk add --no-cache ca-certificates curl
Expand Down Expand Up @@ -45,7 +46,7 @@ RUN mkdir /tmp/kustomize \
# Install Conftest (https://www.conftest.dev/)
RUN mkdir /tmp/conftest \
&& curl -L -o /tmp/conftest/conftest.tar.gz \
https://github.com/instrumenta/conftest/releases/download/v${CONFTEST_VERSION}/conftest_${CONFTEST_VERSION}_Linux_x86_64.tar.gz \
https://github.com/open-policy-agent/conftest/releases/download/v${CONFTEST_VERSION}/conftest_${CONFTEST_VERSION}_Linux_x86_64.tar.gz \
&& tar xf /tmp/conftest/conftest.tar.gz -C /tmp/conftest \
&& mv /tmp/conftest/conftest /usr/local/bin \
&& chmod +x /usr/local/bin/conftest \
Expand Down

0 comments on commit 9fed382

Please sign in to comment.