diff --git a/Dockerfile b/Dockerfile index 63f10cf..64cb697 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM osgeo/gdal:alpine-normal-3.2.1 as build +FROM ghcr.io/osgeo/gdal:alpine-normal-3.8.3 as build -COPY --from=golang:1.16.5-alpine3.13 /usr/local/go/ /usr/local/go/ +COPY --from=golang:1.21.3-alpine /usr/local/go/ /usr/local/go/ RUN apk add --no-cache \ pkgconfig \ @@ -12,17 +12,16 @@ ENV GOROOT=/usr/local/go ENV GOPATH=/go ENV PATH=$PATH:$GOROOT/bin:$GOPATH/bin -RUN go get github.com/githubnemo/CompileDaemon COPY ./ /app WORKDIR /app RUN go build main.go -ENTRYPOINT CompileDaemon --build="go build main.go" --command=./main +# ENTRYPOINT CompileDaemon --build="go build main.go" --command=./main -FROM osgeo/gdal:alpine-normal-3.2.1 as local +FROM ghcr.io/osgeo/gdal:alpine-normal-3.8.3 as local COPY --from=build /app/main /app/main @@ -36,9 +35,6 @@ RUN rm HEC-RAS_62_Example_Projects.zip ENTRYPOINT /app/main -FROM osgeo/gdal:alpine-normal-3.2.1 as prod - -COPY --from=build /app/main /app/main - -ENTRYPOINT /app/main - +FROM ghcr.io/osgeo/gdal:alpine-normal-3.8.3 as prod +COPY --from=build /app/main /main +ENTRYPOINT /main \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 83a6845..68b389d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,9 +10,9 @@ services: container_name: mcat-ras-api image: mcat-ras-api build: - target: build + # target: build # target: local - # target: prod + target: prod context: ./ volumes: - ./:/app diff --git a/go.mod b/go.mod index be9b3b5..9d96d4d 100644 --- a/go.mod +++ b/go.mod @@ -1,28 +1,47 @@ module github.com/Dewberry/mcat-ras -go 1.16 +go 1.21.3 require ( github.com/USACE/filestore v0.1.4 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 + github.com/dewberry/gdal v0.3.4 + github.com/go-errors/errors v1.4.1 + github.com/jackc/pgx v3.6.2+incompatible + github.com/jmoiron/sqlx v1.3.4 + github.com/labstack/echo/v4 v4.3.0 + github.com/swaggo/swag v1.7.0 +) + +require ( + github.com/KyleBanks/depth v1.2.1 // indirect + github.com/PuerkitoBio/purell v1.1.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/aws/aws-sdk-go v1.38.68 // indirect github.com/cockroachdb/apd v1.1.0 // indirect - github.com/dewberry/gdal v0.3.1 - github.com/go-errors/errors v1.4.1 + github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.19.5 // indirect github.com/go-openapi/spec v0.20.0 // indirect + github.com/go-openapi/swag v0.19.12 // indirect github.com/gofrs/uuid v4.0.0+incompatible // indirect github.com/google/uuid v1.2.0 // indirect github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect - github.com/jackc/pgx v3.6.2+incompatible - github.com/jmoiron/sqlx v1.3.4 - github.com/labstack/echo/v4 v4.3.0 + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/labstack/gommon v0.3.0 // indirect + github.com/mailru/easyjson v0.7.6 // indirect + github.com/mattn/go-colorable v0.1.8 // indirect github.com/mattn/go-isatty v0.0.13 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/shopspring/decimal v1.2.0 // indirect - github.com/swaggo/swag v1.7.0 + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasttemplate v1.2.1 // indirect golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect + golang.org/x/text v0.3.6 // indirect golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect golang.org/x/tools v0.0.0-20201207182000-5679438983bd // indirect - + gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 0531cc9..d217228 100644 --- a/go.sum +++ b/go.sum @@ -19,8 +19,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dewberry/gdal v0.3.1 h1:scISo4PeC3LxjVnG2E5SYIHwbCI2LzcKvoeqbnoQNVc= -github.com/dewberry/gdal v0.3.1/go.mod h1:3knazvb7vQFrFAl7+iWI34xP0iiRS7iRFZ1C4Jfwx7Q= +github.com/dewberry/gdal v0.3.4 h1:bm49t5v9XsGujYiL1SNJbRJHRrVIugpU7D/mu1GuzXc= +github.com/dewberry/gdal v0.3.4/go.mod h1:i6fpE1FZsyqYGxk7CWI4VR20rpnnsk0cggCx2pdeqME= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -98,8 +98,9 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/swaggo/swag v1.7.0 h1:5bCA/MTLQoIqDXXyHfOpMeDvL9j68OY/udlK4pQoo4E= github.com/swaggo/swag v1.7.0/go.mod h1:BdPIL73gvS9NBsdi7M1JOxLvlbfvNRaBP8m6WT6Aajo= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= @@ -139,8 +140,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -172,5 +171,6 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=