diff --git a/.dockerfile b/.dockerfile index 46bd9a3..040246e 100644 --- a/.dockerfile +++ b/.dockerfile @@ -46,6 +46,7 @@ RUN ./.install/yadm.sh RUN ./.install/packr.sh RUN ./.install/caddy.sh RUN ./.install/kubectl.sh +RUN ./.install/minio-client.sh RUN ./.install/yarn.sh #RUN ./.install/grunt.sh #RUN ./.install/gulp.sh diff --git a/.drone.yml b/.drone.yml index 5278156..4943c02 100644 --- a/.drone.yml +++ b/.drone.yml @@ -117,10 +117,20 @@ steps: kind: pipeline name: test-kubectl steps: -- name: test-kubctl +- name: test-kubectl image: alpine:latest commands: - ./.install/sudo.sh - ./.install/kubectl.sh - ~/.local/bin/kubectl version -c +--- +kind: pipeline +name: test-minio-client +steps: +- name: test-minio-client + image: alpine:latest + commands: + - ./.install/sudo.sh + - ./.install/minio-client.sh + - ~/.local/bin/mc version diff --git a/.install/minio-client.sh b/.install/minio-client.sh new file mode 100755 index 0000000..c0161c8 --- /dev/null +++ b/.install/minio-client.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +set -e +source ./.versions + +echo +echo "Installing minio-client..." +echo + +sudo apk add --no-cache --virtual .build-deps \ + curl + +mkdir -p ~/.local/bin +curl -fLo ~/.local/bin/mc https://dl.minio.io/client/mc/release/linux-amd64/mc +chmod a+x ~/.local/bin/mc + +sudo apk del .build-deps diff --git a/.runenv b/.local/bin/runenv similarity index 94% rename from .runenv rename to .local/bin/runenv index be38d02..84fb07d 100644 --- a/.runenv +++ b/.local/bin/runenv @@ -74,6 +74,8 @@ docker pull $CONTAINER_IMAGE cmd="\n\ docker run -it $delete$name$ports$workdir$volumes\n\ -v $HOME/.ssh:$CONTAINER_HOME/.ssh \n\ + -v $HOME/.kube:$CONTAINER_HOME/.kube \n\ + -v $HOME/.mc:$CONTAINER_HOME/.mc \n\ $CONTAINER_IMAGE \n\ $@\ " diff --git a/.local/bin/share b/.local/bin/share index 838030d..2cd3de8 100755 --- a/.local/bin/share +++ b/.local/bin/share @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/zsh if [ ! -x "$(which mc)" ]; then echo "Please install the minio client first" @@ -63,7 +63,7 @@ while getopts "hn:e:f:" opt; do done read_fileopts -for i in ${!FILES[@]}; do +for i in {1..$#foo}; do FILE="${FILES[$i]}" NAME="${NAMES[$i]}" EXPIRE="${EXPIRES[$i]}" diff --git a/README.md b/README.md index 66892c9..12c8ad0 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,8 @@ docker run -it -p 8080:8080 -v $PWD:/home/ambrose/src -v $HOME/.ssh:/home/ambros Which is also packed as a script: ```sh -curl -fLo ~/.bin/runenv https://raw.githubusercontent.com/serverwentdown/env/master/.runenv -chmod +x ~/.bin/runenv +curl -fLo ~/.local/bin/runenv https://raw.githubusercontent.com/serverwentdown/env/master/.local/bin/runenv +chmod +x ~/.local/bin/runenv runenv ```