From 582389ec66b3e5ccef03e5b9219847e57c25f614 Mon Sep 17 00:00:00 2001 From: Preetam Jinka Date: Tue, 18 Jan 2022 09:45:53 -0800 Subject: [PATCH] fix execution within Docker, add missing postgres driver --- Dockerfile | 2 ++ api/datasets.go | 1 + go.mod | 1 + go.sum | 2 ++ 4 files changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index c8d8ce5..7c98da1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,8 @@ RUN cd /src/ && go build -x -ldflags "-linkmode external -extldflags -static" FROM alpine:3 +RUN apk add docker + COPY --from=build-go /src/crossjoin /bin/crossjoin WORKDIR /crossjoin diff --git a/api/datasets.go b/api/datasets.go index 20fb808..b7f6709 100644 --- a/api/datasets.go +++ b/api/datasets.go @@ -14,6 +14,7 @@ import ( "time" "github.com/crossjoin-io/crossjoin/config" + _ "github.com/lib/pq" "gopkg.in/yaml.v2" ) diff --git a/go.mod b/go.mod index 3968dbd..82eb108 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.16 require ( github.com/google/uuid v1.1.2 github.com/gorilla/mux v1.8.0 + github.com/lib/pq v1.10.4 // indirect github.com/mattn/go-sqlite3 v1.14.9 github.com/spf13/cobra v1.2.1 gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index e006e42..72e266a 100644 --- a/go.sum +++ b/go.sum @@ -175,6 +175,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk= +github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=