From 7f12112919e62446b1720b4fcd0abf2b4c4ee387 Mon Sep 17 00:00:00 2001 From: Hugo Thunnissen Date: Wed, 6 Apr 2022 14:46:04 +0200 Subject: [PATCH] Add Drone cli to image --- Dockerfile | 8 +++++--- bash/bash_aliases | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 17bcca7..72697d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -92,7 +92,11 @@ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o / "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \ $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null -RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install docker-ce-cli +RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install docker-ce-cli apt-file +RUN apt-file update + +RUN curl -fsSL https://github.com/drone/drone-cli/releases/latest/download/drone_linux_amd64.tar.gz \ + | tar -xzf - -C /usr/bin/ ADD . /opt/workspace-repo WORKDIR /opt/workspace-repo @@ -100,5 +104,3 @@ RUN go build . RUN cp ./workspace /bin/workspace ENTRYPOINT [ "/bin/workspace", "entrypoint" ] - -#"source ~/dotfiles/environment; dots pkg exec \"$@\"", "--"] diff --git a/bash/bash_aliases b/bash/bash_aliases index 911e03c..024ba07 100644 --- a/bash/bash_aliases +++ b/bash/bash_aliases @@ -217,8 +217,8 @@ untrack() { done } -if [[ -f "$/WORKSPACE_CONFIG_DIR/environment" ]]; then - source "$/WORKSPACE_CONFIG_DIR/environment" +if [[ -f "$WORKSPACE_CONFIG_DIR/environment" ]]; then + source "$WORKSPACE_CONFIG_DIR/environment" fi PROMPT_COMMAND='history -a'