diff --git a/Dockerfile b/Dockerfile index f8a99f3ca..7bb3d8efb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,14 @@ -FROM golang:1.18.3-bullseye +FROM ghcr.io/goccy/go-zetasql:latest ARG VERSION WORKDIR /work -RUN apt-get update && apt-get install -y --no-install-recommends clang +COPY . ./ -COPY ./go.* ./ +RUN go mod edit -replace github.com/goccy/go-zetasql=../go-zetasql RUN go mod download -COPY . ./ - RUN make emulator/build FROM debian:bullseye AS emulator diff --git a/go.mod b/go.mod index bc1ad9885..096909c03 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,8 @@ require ( github.com/go-playground/validator/v10 v10.11.0 github.com/goccy/go-json v0.10.0 github.com/goccy/go-yaml v1.9.5 - github.com/goccy/go-zetasql v0.5.1 - github.com/goccy/go-zetasqlite v0.17.2 + github.com/goccy/go-zetasql v0.5.4 + github.com/goccy/go-zetasqlite v0.17.3 github.com/google/go-cmp v0.5.9 github.com/googleapis/gax-go/v2 v2.7.1 github.com/gorilla/mux v1.8.0 diff --git a/go.sum b/go.sum index c76456775..c7d6aa9d4 100644 --- a/go.sum +++ b/go.sum @@ -77,10 +77,10 @@ github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA= github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-yaml v1.9.5 h1:Eh/+3uk9kLxG4koCX6lRMAPS1OaMSAi+FJcya0INdB0= github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA= -github.com/goccy/go-zetasql v0.5.1 h1:vP9wgUH5gylw8yL+gwO0wF7uW/fW5Dr1AAAzi8Kgevg= -github.com/goccy/go-zetasql v0.5.1/go.mod h1:6W14CJVKh7crrSPyj6NPk4c49L2NWnxvyDLsRkOm4BI= -github.com/goccy/go-zetasqlite v0.17.2 h1:APhXUyXWS2QzO5pBAYGGkfGAaby4+05pd7yAufG7ld4= -github.com/goccy/go-zetasqlite v0.17.2/go.mod h1:ikLN7nRFum4sXL6kDxgIWrhH/9iZSdwXWXZzMUnuTjM= +github.com/goccy/go-zetasql v0.5.4 h1:s1ZPmN/hA+J1kr59MJSbCZtmoUuJwgPmsTesvzHMreU= +github.com/goccy/go-zetasql v0.5.4/go.mod h1:xvvooX2RG404vnbdFZuAM8bTFksYwVUlqeIUrUNuo40= +github.com/goccy/go-zetasqlite v0.17.3 h1:YIcfRttvWxWjkj0xZCpFqx/7dGJFKWbD2CgCbrXhZj4= +github.com/goccy/go-zetasqlite v0.17.3/go.mod h1:anojP55YeYsrF0WjL7WQbxNCz5rg0Un/NaToBDMfuIw= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=