Skip to content

Commit

Permalink
Update spray version in ci/dockerfile (kubernetes-sigs#6041)
Browse files Browse the repository at this point in the history
  • Loading branch information
floryut authored Apr 29, 2020
1 parent 28333d4 commit 72b68c7
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ stages:
- deploy-special

variables:
KUBESPRAY_VERSION: v2.12.5
KUBESPRAY_VERSION: v2.12.6
FAILFASTCI_NAMESPACE: 'kargo-ci'
GITLAB_REPOSITORY: 'kargo-ci/kubernetes-sigs-kubespray'
ANSIBLE_FORCE_COLOR: "true"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - &&
&& apt update -y && apt-get install docker-ce -y
COPY . .
RUN /usr/bin/python3 -m pip install pip -U && /usr/bin/python3 -m pip install -r tests/requirements.txt && python3 -m pip install -r requirements.txt && update-alternatives --install /usr/bin/python python /usr/bin/python3 1
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.14.4/bin/linux/amd64/kubectl \
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.5/bin/linux/amd64/kubectl \
&& chmod a+x kubectl && cp kubectl /usr/local/bin/kubectl

# Some tools like yamllint need this
Expand Down
2 changes: 1 addition & 1 deletion test-infra/vagrant-docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Docker image published at quay.io/kubespray/vagrant

ARG KUBESPRAY_VERSION=v2.12.5
ARG KUBESPRAY_VERSION=v2.12.6
FROM quay.io/kubespray/kubespray:${KUBESPRAY_VERSION}

ENV VAGRANT_VERSION=2.2.7
Expand Down

0 comments on commit 72b68c7

Please sign in to comment.