diff --git a/.drone.yml b/.drone.yml index e18c8b9..e057530 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,15 +1,27 @@ +--- + +platform: + os: linux + arch: amd64 + workspace: base: /go path: src/go.jonnrb.io/vanity -pipeline: - build: - image: golang:latest - commands: - - go test ./... - - go build ./... - docker: - image: plugins/docker +steps: +- name: build + image: golang:latest + commands: + - go test ./... + - go build ./... + +- name: docker + image: plugins/docker + settings: repo: jonnrb/vanityserver + secrets: + - docker_username + - docker_password storage_driver: overlay2 - secrets: [ docker_username, docker_password ] + +... diff --git a/Dockerfile b/Dockerfile index 1b50990..18c1890 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ -from golang:1.10.3 as build -add . /go/src/go.jonnrb.io/vanity -workdir /go/src/go.jonnrb.io/vanity -run go install ./cmd/vanityserver +from golang:1.11.2 as build +add . /src +run cd /src && go get -v ./cmd/vanityserver from gcr.io/distroless/base expose 8080 diff --git a/cmd/vanityserver/build.sh b/cmd/vanityserver/build.sh deleted file mode 100755 index 8c4295e..0000000 --- a/cmd/vanityserver/build.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -e -GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" . -upx vanityserver -docker build -t jonnrb/vanity . -rm vanityserver diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..8ab3ef8 --- /dev/null +++ b/go.mod @@ -0,0 +1 @@ +module go.jonnrb.io/vanity