From bc163618d70c94bf2c96dc4ecb12ffac145c47df Mon Sep 17 00:00:00 2001 From: Hunter Long Date: Mon, 4 Mar 2019 07:48:08 -0800 Subject: [PATCH] sass dockerfile --- .travis.yml | 2 +- Dockerfile | 6 +++--- Gopkg.lock | 11 +++++------ version.txt | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index b91d6864..8c4d8352 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ os: - linux language: go -go: 1.11.x +go: 1.12.x go_import_path: github.com/hunterlong/statping cache: diff --git a/Dockerfile b/Dockerfile index 349d38bb..1c8f467d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM golang:1.11-alpine as base +FROM golang:1.12-alpine as base MAINTAINER "Hunter Long (https://github.com/hunterlong)" ARG VERSION ENV DEP_VERSION v0.5.0 -RUN apk add --no-cache libstdc++ gcc g++ make git ca-certificates linux-headers wget curl jq +RUN apk add --no-cache libstdc++ gcc g++ make git ca-certificates linux-headers wget curl jq libsass RUN curl -L -s https://github.com/golang/dep/releases/download/$DEP_VERSION/dep-linux-amd64 -o /go/bin/dep && \ chmod +x /go/bin/dep RUN curl -L -s https://assets.statping.com/sass -o /usr/local/bin/sass && \ @@ -21,7 +21,7 @@ ARG VERSION ENV IS_DOCKER=true ENV STATPING_DIR=/app ENV PORT=8080 -RUN apk --no-cache add curl jq +RUN apk --no-cache add curl jq libsass COPY --from=base /usr/local/bin/sass /usr/local/bin/sass COPY --from=base /go/bin/statping /usr/local/bin/statping diff --git a/Gopkg.lock b/Gopkg.lock index e9d70fd4..49aaed5a 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -21,12 +21,12 @@ version = "0.0.1" [[projects]] - branch = "master" - digest = "1:5fd5c4d4282935b7a575299494f2c09e9d2cacded7815c83aff7c1602aff3154" + digest = "1:86b9f9c54fcddec313009ef19073bf0124bbdae3701080c32f67c0c8817b3b7c" name = "github.com/daaku/go.zipexe" packages = ["."] pruneopts = "UT" - revision = "a5fe2436ffcb3236e175e5149162b41cd28bd27d" + revision = "db7cf2ba330f8c2d28b827826e33d6628ea7e9e0" + version = "v1.0.0" [[projects]] digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec" @@ -175,14 +175,14 @@ [[projects]] branch = "master" - digest = "1:1ecf2a49df33be51e757d0033d5d51d5f784f35f68e5a38f797b2d3f03357d71" + digest = "1:9d5b5d543996dd584da1db1e0de1926f3e4c3a8dba0fa2f8db70f3ebee2342e0" name = "golang.org/x/crypto" packages = [ "bcrypt", "blowfish", ] pruneopts = "UT" - revision = "b8fe1690c61389d7d2a8074a507d1d40c5d30448" + revision = "8dd112bcdc25174059e45e07517d9fc663123347" [[projects]] digest = "1:c25289f43ac4a68d88b02245742347c94f1e108c534dda442188015ff80669b3" @@ -221,7 +221,6 @@ analyzer-version = 1 input-imports = [ "github.com/GeertJohan/go.rice", - "github.com/GeertJohan/go.rice/embedded", "github.com/ararog/timeago", "github.com/go-mail/mail", "github.com/go-yaml/yaml", diff --git a/version.txt b/version.txt index e6595e76..62440153 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.80.5 +0.80.51