Skip to content

Commit

Permalink
Revert "Fix/zsh compatability for tools (#26)" (#28)
Browse files Browse the repository at this point in the history
This reverts commit 2056242.
  • Loading branch information
fernandoataoldotcom authored Oct 4, 2023
1 parent a8df6ee commit 5efa2d1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 19 deletions.
5 changes: 2 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ ARG VERSION_ARGO_CD_CLI=2.8.3
# https://github.com/GlueOps/terraform-module-kubernetes-hashicorp-vault-configuration/wiki
ENV VAULT_SKIP_VERIFY true
ENV CLOUDSDK_INSTALL_DIR /usr/local/gcloud/
COPY ../tools/tools.sh /etc/tools.sh
COPY ../tools/add-tools-to-shells.sh /tmp/add-tools-to-shells.sh
RUN chmod +x /tmp/add-tools-to-shells.sh && /tmp/add-tools-to-shells.sh
ADD ../tools/add-to-bashrc.sh /tmp/add-to-bashrc.sh
RUN chmod +x /tmp/add-to-bashrc.sh && ./tmp/add-to-bashrc.sh
RUN curl -Lo /usr/local/bin/kubectl https://dl.k8s.io/release/v${VERSION_KUBECTL}/bin/linux/amd64/kubectl \
&& chmod +x /usr/local/bin/kubectl \
&& curl -Lo terraform_${VERSION_TERRAFORM}_linux_amd64.zip https://releases.hashicorp.com/terraform/${VERSION_TERRAFORM}/terraform_${VERSION_TERRAFORM}_linux_amd64.zip \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash


echo '
run-gha() {
#https://stackoverflow.com/questions/6245570/how-do-i-get-the-current-branch-name-in-git
gh workflow run --ref=$(git rev-parse --abbrev-ref HEAD)
Expand Down Expand Up @@ -79,3 +82,4 @@ create-ghcr-regcred() {
echo "{\"auths\":{\"ghcr.io\":{\"auth\":\"$b64_enc_regcred\"}}}"
}
' >> /home/vscode/.bashrc
16 changes: 0 additions & 16 deletions .devcontainer/tools/add-tools-to-shells.sh

This file was deleted.

0 comments on commit 5efa2d1

Please sign in to comment.