Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ldming committed Nov 27, 2023
1 parent fb002f6 commit 4b89f1b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 16 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile-dev
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ RUN bash /tmp/library-scripts/setup-user.sh "${USERNAME}" "${PATH}" \
&& apt-get autoremove -y && apt-get clean -y && rm -rf /tmp/library-scripts/

# [Optional] Uncomment the next line to use go get to install anything else you need
# RUN go get -x <your-dependency-or-tool>
RUN go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest

# [Optional] Uncomment this section to install additional OS packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
Expand Down
19 changes: 4 additions & 15 deletions docker/custom-scripts/kubectl-helm-debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@ set -e
KUBECTL_VERSION="${1:-"latest"}"
HELM_VERSION="${2:-"latest"}"
MINIKUBE_VERSION="${3:-"none"}" # latest is also valid
ETCD_VERSION="${4:-"none"}"
KUBECTL_SHA256="${5:-"automatic"}"
HELM_SHA256="${6:-"automatic"}"
MINIKUBE_SHA256="${7:-"automatic"}"
USERNAME=${8:-"automatic"}
KUBECTL_SHA256="${4:-"automatic"}"
HELM_SHA256="${5:-"automatic"}"
MINIKUBE_SHA256="${6:-"automatic"}"
USERNAME=${7:-"automatic"}

HELM_GPG_KEYS_URI="https://raw.githubusercontent.com/helm/helm/main/KEYS"
GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
Expand Down Expand Up @@ -226,16 +225,6 @@ if [ "${MINIKUBE_VERSION}" != "none" ]; then
fi
fi

# Install etcd
if [ "${ETCD_VERSION}" != "none" ]; then
echo "Downloading etcd..."
curl -L "https://github.com/etcd-io/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-${architecture}.tar.gz" -o "/tmp/etcd-${ETCD_VERSION}-linux-${architecture}.tar.gz"
tar xf "/tmp/etcd-${ETCD_VERSION}-linux-${architecture}.tar.gz" -C /tmp
mv -f "/tmp/etcd-${ETCD_VERSION}-linux-${architecture}/etcd" /usr/local/bin/etcd
mv -f "/tmp/etcd-${ETCD_VERSION}-linux-${architecture}/etcdctl" /usr/local/bin/etcdctl
rm -rf "/tmp/etcd-${ETCD_VERSION}-linux-${architecture}"
fi

if ! type docker > /dev/null 2>&1; then
echo -e '\n(*) Warning: The docker command was not found.\n\nYou can use one of the following scripts to install it:\n\nhttps://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker-in-docker.md\n\nor\n\nhttps://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker.md'
fi
Expand Down

0 comments on commit 4b89f1b

Please sign in to comment.