Skip to content

Commit

Permalink
Merge pull request #1 from superseb/kubectl
Browse files Browse the repository at this point in the history
Add kubectl
  • Loading branch information
leodotcloud authored Aug 10, 2018
2 parents 22b47d5 + 0429ff6 commit 1dda8d8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
11 changes: 9 additions & 2 deletions package/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM ubuntu:18.04
RUN apt-get update && \
apt-get install --no-install-recommends -y \
tree \
Expand Down Expand Up @@ -36,8 +36,15 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/* && \
mv /usr/sbin/tcpdump /usr/bin/tcpdump && \
curl -sLf https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 > /usr/bin/docker && \
chmod +x /usr/bin/docker
chmod +x /usr/bin/docker && \
curl -sLf https://storage.googleapis.com/kubernetes-release/release/v1.9.10/bin/linux/amd64/kubectl > /usr/local/bin/kubectl-1.9 && \
curl -sLf https://storage.googleapis.com/kubernetes-release/release/v1.10.5/bin/linux/amd64/kubectl > /usr/local/bin/kubectl-1.10 && \
curl -sLf https://storage.googleapis.com/kubernetes-release/release/v1.11.2/bin/linux/amd64/kubectl > /usr/local/bin/kubectl-1.11 && \
chmod +x /usr/local/bin/kubectl* && \
ln -s /usr/local/bin/kubectl-1.11 /usr/local/bin/kubectl && \
mkdir /root/.kube

ADD loglevel.tar.gz /usr/bin
COPY swiss-army-knife /usr/bin/
WORKDIR /root
CMD ["swiss-army-knife"]
2 changes: 1 addition & 1 deletion scripts/download
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e
cd $(dirname $0)/..

# Repos
LOGLEVEL_REPO="${LOGLEVEL_REPO:-leodotcloud}"
LOGLEVEL_REPO="${LOGLEVEL_REPO:-rancher}"

# Tags
LOGLEVEL_TAG="${LOGLEVEL_TAG:-v0.1}"
Expand Down

0 comments on commit 1dda8d8

Please sign in to comment.