diff --git a/Dockerfile b/Dockerfile index b1faf33..d39316c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ -FROM golang:1.8 +FROM golang:1.13 WORKDIR /go/src/app COPY . . -RUN go-wrapper download && \ - go-wrapper install +RUN go get -u github.com/zhutik/adyen-api-go +RUN go build -v ./... EXPOSE 8080 -CMD ["go-wrapper", "run"] # ["main.go"] +CMD ["go", "run", "main.go"] diff --git a/README.md b/README.md index 39f8301..c84a1b5 100644 --- a/README.md +++ b/README.md @@ -93,10 +93,6 @@ Open ```http://localhost:8080``` in your browser ## Run example without Docker ``` -# Install dependencies -$ go get -d -v ./... -$ go install -v ./... - $ go run main.go ``` diff --git a/docker-compose.yml b/docker-compose.yml index 1de1294..fae7dea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: golang: build: . - image: golang:1.8 + image: golang:1.13 volumes: - .:/go/src/app environment: diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..1589d9e --- /dev/null +++ b/go.mod @@ -0,0 +1,7 @@ +module github.com/zhutik/adyen-api-go-example + +require ( + github.com/ernesto-jimenez/httplogger v0.0.0-20150224132909-86cc44f6150a + github.com/gorilla/mux v1.7.4 + github.com/zhutik/adyen-api-go v0.0.0-20200309114350-6d481737b6f7 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..fb27429 --- /dev/null +++ b/go.sum @@ -0,0 +1,10 @@ +github.com/ernesto-jimenez/httplogger v0.0.0-20150224132909-86cc44f6150a h1:XTdOK/wISWQFdWj1D9c3DagauL22s0eMPL70K0pMuw4= +github.com/ernesto-jimenez/httplogger v0.0.0-20150224132909-86cc44f6150a/go.mod h1:zroVJTjbZUlS0lcewJlcPsS6JQIoFWePhxjOF0/n0f4= +github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc= +github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/zhutik/adyen-api-go v0.0.0-20200309114350-6d481737b6f7 h1:WBN5KQEjk8lubV+ognaUPX+Hd1of2UdSGhmlEh5vKsY= +github.com/zhutik/adyen-api-go v0.0.0-20200309114350-6d481737b6f7/go.mod h1:pAstUsBD/ymNyWuq6L944J2cXyoHJ347LiBptp2ANkY= diff --git a/main.go b/main.go index 3d5e27e..e0597a4 100644 --- a/main.go +++ b/main.go @@ -21,8 +21,8 @@ import ( "strconv" "time" - "./controller" - "./logger" + "github.com/zhutik/adyen-api-go-example/controller" + "github.com/zhutik/adyen-api-go-example/logger" "github.com/ernesto-jimenez/httplogger" "github.com/gorilla/mux"