Skip to content
This repository was archived by the owner on Nov 13, 2024. It is now read-only.

switch from using glide to go modules everywhere #25

Merged
merged 2 commits into from
Jul 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 4 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ jobs:
build:
docker:
# specify the version
- image: circleci/golang:1.9
- image: circleci/golang:1.12
environment:
GO111MODULE: "on"

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
Expand All @@ -22,5 +24,5 @@ jobs:
- checkout

# specify any bash command here prefixed with `run: `
- run: go get -v -t -d ./...
- run: go get -v -d ./...
- run: go test -v ./...
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.circleci/*
.dockerignore
Dockerfile*
keystore/
goplaxt
3 changes: 2 additions & 1 deletion Dockerfile-amd64
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
FROM golang:alpine as builder
WORKDIR $GOPATH/src/github.com/xanderstrike/goplaxt/
RUN apk add --no-cache git
COPY . .
RUN mkdir /out
RUN mkdir /out/keystore
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /out/goplaxt-docker
RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /out/goplaxt-docker

FROM scratch
LABEL maintainer="xanderstrike@gmail.com"
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile-arm7
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
FROM golang:alpine as builder
WORKDIR $GOPATH/src/github.com/xanderstrike/goplaxt/
RUN apk add --no-cache git
COPY . .
RUN mkdir /out
RUN mkdir /out/keystore
RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=7 go build -o /out/goplaxt-docker
RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=7 go build -o /out/goplaxt-docker

FROM scratch
LABEL maintainer="xanderstrike@gmail.com"
Expand Down
5 changes: 1 addition & 4 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
#!/bin/bash

# update dependencies
#docker run --rm -it -v $PWD:/go/src/github.com/xanderstrike/goplaxt -w /go/src/github.com/xanderstrike/goplaxt treeder/glide update

# build binary
docker run --rm -v "$PWD":/go/src/github.com/xanderstrike/goplaxt -w /go/src/github.com/xanderstrike/goplaxt iron/go:dev go build -o goplaxt-docker
docker run --rm -e GO111MODULE=on -v "$PWD":/go/src/github.com/xanderstrike/goplaxt -w /go/src/github.com/xanderstrike/goplaxt iron/go:dev go build -o goplaxt-docker

# build docker image
docker build -t xanderstrike/goplaxt .
Expand Down
51 changes: 0 additions & 51 deletions glide.lock

This file was deleted.

5 changes: 0 additions & 5 deletions glide.yaml

This file was deleted.

15 changes: 15 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
module github.com/xanderstrike/goplaxt

go 1.12

require (
github.com/alicebob/miniredis/v2 v2.8.0
github.com/go-redis/redis v0.0.0-20190305141034-b665d8fcf239
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c
github.com/gorilla/handlers v0.0.0-20190227193432-ac6d24f88de4
github.com/gorilla/mux v0.0.0-20190228181203-15a353a63672
github.com/lib/pq v1.1.1
github.com/peterbourgon/diskv v0.0.0-20180312054125-0646ccaebea1
github.com/stretchr/testify v1.3.0
github.com/xanderstrike/plexhooks v0.0.0-20190226042007-cbcc0e4d77a5
)
33 changes: 33 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6 h1:45bxf7AZMwWcqkLzDAQugVEwedisr5nRJ1r+7LYnv0U=
github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
github.com/alicebob/miniredis/v2 v2.8.0 h1:D2PcdeNYhveIx1zwrymjHKlm0wS8CO6U/byxwkwgnco=
github.com/alicebob/miniredis/v2 v2.8.0/go.mod h1:whQg0d9p0nLZXvahDkAYeQjqIauyYyFi3N1sw2p994c=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/go-redis/redis v0.0.0-20190305141034-b665d8fcf239 h1:t0CxOdtLscoWjfxYfrkNKUstzoK3bDQkGYXcVu3/G7A=
github.com/go-redis/redis v0.0.0-20190305141034-b665d8fcf239/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/gorilla/handlers v0.0.0-20190227193432-ac6d24f88de4 h1:0Kf6Olt6OB/0z28orAeuAQ6eK4Ub8peqJ7k4wiOA2c8=
github.com/gorilla/handlers v0.0.0-20190227193432-ac6d24f88de4/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
github.com/gorilla/mux v0.0.0-20190228181203-15a353a63672 h1:fTizlyYZUIFC4uIxHfvBI63fZvJZPbfSDKkl4WbdhqM=
github.com/gorilla/mux v0.0.0-20190228181203-15a353a63672/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/peterbourgon/diskv v0.0.0-20180312054125-0646ccaebea1 h1:k/dnb0bixQwWsDLxwr6/w7rtZCVDKdbQnGQkeZGYsws=
github.com/peterbourgon/diskv v0.0.0-20180312054125-0646ccaebea1/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/xanderstrike/plexhooks v0.0.0-20190226042007-cbcc0e4d77a5 h1:4dorjotJiXpevdY5hXg68XQZ/0GurQg86eWxOM/rkGY=
github.com/xanderstrike/plexhooks v0.0.0-20190226042007-cbcc0e4d77a5/go.mod h1:IXlzovfjAZX8O7nzPwCiYe2T0i/0enZzzqkvVq8N02M=
github.com/yuin/gopher-lua v0.0.0-20190206043414-8bfc7677f583 h1:SZPG5w7Qxq7bMcMVl6e3Ht2X7f+AAGQdzjkbyOnNNZ8=
github.com/yuin/gopher-lua v0.0.0-20190206043414-8bfc7677f583/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ=
golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
2 changes: 1 addition & 1 deletion lib/store/redis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"
"time"

"github.com/alicebob/miniredis"
"github.com/alicebob/miniredis/v2"
"github.com/stretchr/testify/assert"
)

Expand Down
22 changes: 0 additions & 22 deletions vendor/github.com/alicebob/gopher-json/LICENSE

This file was deleted.

7 changes: 0 additions & 7 deletions vendor/github.com/alicebob/gopher-json/README.md

This file was deleted.

20 changes: 0 additions & 20 deletions vendor/github.com/alicebob/gopher-json/doc.go

This file was deleted.

Loading