Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
72b68c7f
Unverified
Commit
72b68c7f
authored
5 years ago
by
Florian Ruynat
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Update spray version in ci/dockerfile (#6041)
parent
28333d45
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
Dockerfile
+1
-1
1 addition, 1 deletion
Dockerfile
test-infra/vagrant-docker/Dockerfile
+1
-1
1 addition, 1 deletion
test-infra/vagrant-docker/Dockerfile
with
3 additions
and
3 deletions
.gitlab-ci.yml
+
1
−
1
View file @
72b68c7f
...
@@ -8,7 +8,7 @@ stages:
...
@@ -8,7 +8,7 @@ stages:
-
deploy-special
-
deploy-special
variables
:
variables
:
KUBESPRAY_VERSION
:
v2.12.
5
KUBESPRAY_VERSION
:
v2.12.
6
FAILFASTCI_NAMESPACE
:
'
kargo-ci'
FAILFASTCI_NAMESPACE
:
'
kargo-ci'
GITLAB_REPOSITORY
:
'
kargo-ci/kubernetes-sigs-kubespray'
GITLAB_REPOSITORY
:
'
kargo-ci/kubernetes-sigs-kubespray'
ANSIBLE_FORCE_COLOR
:
"
true"
ANSIBLE_FORCE_COLOR
:
"
true"
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
1
−
1
View file @
72b68c7f
...
@@ -14,7 +14,7 @@ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - &&
...
@@ -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
&&
apt update
-y
&&
apt-get
install
docker-ce
-y
COPY
. .
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
/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.1
4.4
/bin/linux/amd64/kubectl
\
RUN
curl
-LO
https://storage.googleapis.com/kubernetes-release/release/v1.1
7.5
/bin/linux/amd64/kubectl
\
&&
chmod
a+x kubectl
&&
cp
kubectl /usr/local/bin/kubectl
&&
chmod
a+x kubectl
&&
cp
kubectl /usr/local/bin/kubectl
# Some tools like yamllint need this
# Some tools like yamllint need this
...
...
This diff is collapsed.
Click to expand it.
test-infra/vagrant-docker/Dockerfile
+
1
−
1
View file @
72b68c7f
# Docker image published at quay.io/kubespray/vagrant
# 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}
FROM
quay.io/kubespray/kubespray:${KUBESPRAY_VERSION}
ENV
VAGRANT_VERSION=2.2.7
ENV
VAGRANT_VERSION=2.2.7
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment