From 0150d474292c4dd3717198ca6c875015eb96b5f4 Mon Sep 17 00:00:00 2001 From: an Date: Sun, 27 Jan 2019 15:12:06 +0100 Subject: [PATCH] Added .drone.yml --- .drone.yml | 39 +++++++++++++++++++++++++++++++++++++++ main.go | 3 ++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..7fef293 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,39 @@ + pipeline: + prebuild: + image: golang:latest + commands: + - IMAGE=dr.dnix.de/$DRONE_REPO_NAME + - REV=$(git rev-list HEAD --count) + - BUILDDATE=$(date) + - BRANCH=$DRONE_COMMIT_BRANCH + - TAGS=.tags + - echo "Building image $IMAGE:$BRANCH-$REV" + - echo -n "$BRANCH-$REV" >$TAGS + - cat $TAGS + build_docker: + image: plugins/docker + repo: dr.dnix.de/${DRONE_REPO_NAME} + tags: + - latest + deploy: + image: ubuntu:16.04 + secrets: + - K8S_SSH_PRIVATE_KEY + - K8S_SSH_PUBLIC_KEY + commands: + - apt update + - apt -y upgrade + - apt install -y git + - IMAGE=dr.dnix.de/$DRONE_REPO_NAME + - BRANCH=$DRONE_COMMIT_BRANCH + - REV=$(git rev-list HEAD --count) + - echo "Deploying image $IMAGE:$BRANCH-$REV" + - cd ~ + - mkdir .ssh + - chmod 700 .ssh + - echo "$K8S_SSH_PRIVATE_KEY" >.ssh/id_rsa + - chmod 600 .ssh/id_rsa + - echo "$K8S_SSH_PUBLIC_KEY" >.ssh/id_rsa.pub + - chmod 600 .ssh/id_rsa.pub + - ssh -oStrictHostKeyChecking=no root@master01 "kubectl set image deployment/image-transformer image-transforめer=dr.dnix.de/image-transformer:$BRANCH-$REV -n dnix-image-transformer" + - ssh -oStrictHostKeyChecking=no root@master01 "kubectl rollout status deployment/image-transformer -n image-transformer" diff --git a/main.go b/main.go index 2ee5b51..b9241ef 100644 --- a/main.go +++ b/main.go @@ -77,7 +77,7 @@ func resizeHandler(w http.ResponseWriter, r *http.Request) { // it since we are directly piping it to the ResponseWriter _, _, err = vips.NewTransform(). Load(resp.Body). - ResizeStrategy(vips.ResizeStrategyEmbed). + ResizeStrategy(vips.ResizeStrategyAuto). Resize(iw, ih). Output(w). Apply() @@ -86,6 +86,7 @@ func resizeHandler(w http.ResponseWriter, r *http.Request) { writeError(w, imgPath, method, "failed to resize", http.StatusInternalServerError) return } + case "thumbnail": default: writeError(w, imgPath, method, "unknown method", http.StatusBadRequest)