Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
e53e5b3
Bump gopkg.in/yaml.v3 from 3.0.0-20200313102051-9f266ea9e77c to 3.0.1
eldang Nov 15, 2023
6a11a13
go tidy autoclean
eldang Nov 15, 2023
fec0bab
Fixed tests
eldang Nov 15, 2023
1302fd1
golang.org/x/image v0.0.0 -> v0.14.0
eldang Nov 20, 2023
2183221
golang/x/net 0.0.0 -> 0.18.0 ; golang/x/crypto 0.0.0 -> 0.15.0
eldang Nov 20, 2023
cd91cd3
gogo/protobuf v1.2.1 -> v1.3.2
eldang Nov 20, 2023
cbc80dc
dgrijalva/jwt-go v3.2.0+incompatible => v3.2.1-0.20180308231308-06ea1…
eldang Nov 20, 2023
96ec1f5
viper 1.7.1 => 1.17.0
eldang Nov 20, 2023
927d1c2
client_golang v1.11.1 => v1.17.0
eldang Nov 20, 2023
aa97b91
gorilla/handlers 1.5.1 => 1.5.2
eldang Nov 20, 2023
e996985
gorilla/mux 1.8.0 => 1.8.1
eldang Nov 20, 2023
9262d08
pgconn 1.7.2 => 1.14.1
eldang Nov 20, 2023
a65c41b
pgtype 1.6.1 => 1.14.0
eldang Nov 20, 2023
9d347f6
pgx 4.12.1 => 4.18.1
eldang Nov 20, 2023
3acca20
logrus 1.7.0 => 1.9.3
eldang Nov 20, 2023
c93ad26
Updated minimum Go version
eldang Nov 20, 2023
93bb19f
Update Go version to 1.18
eldang Nov 20, 2023
c09f4ea
Updated Go version to 1.18
eldang Nov 20, 2023
bf7a9c0
exp v0.0.0-20230905200255-921286631fa9 => v0.0.0-20231110203233-9a3e…
eldang Nov 20, 2023
4d04235
no-op change to trigger a CI run
eldang Nov 20, 2023
937d623
Revert "no-op change to trigger a CI run"
eldang Nov 20, 2023
ec23e15
Trying Go 1.21
eldang Nov 20, 2023
b99cfc5
Updated go version in Dockerfile to what I've been testing with locally
eldang Nov 20, 2023
35c8812
Merge branch 'master' into dependency-updates
eldang Jan 16, 2024
4628dce
Expose error to user (this would have saved me soem time)
nein09 Jan 17, 2024
be14b84
Clean up BasePath setting in preparation for more tests
nein09 Jan 17, 2024
c6f8dd9
Test show/hide preview functionality
nein09 Jan 17, 2024
47707c5
Simple health check endpoint and tests
nein09 Jan 17, 2024
77b9bdb
Make response make more sense when viewed in a browser
nein09 Jan 17, 2024
0877037
Update readme and add a test to make sure i am not lying
nein09 Jan 17, 2024
e8e0341
Merge pull request #3 from eldang/health-endpoint
eldang Jan 17, 2024
1603e06
Merge pull request #4 from CrunchyData/master
eldang Jan 25, 2024
6d07d2f
Merge branch 'master' into dependency-updates
eldang Jun 17, 2024
c3fd86a
Routine dependency updates
eldang Jun 17, 2024
ae8dda0
revert antlr version
eldang Jun 17, 2024
2b63737
Merge pull request #5 from eldang/dependency-updates
eldang Jun 17, 2024
a4ed648
Merge branch 'master' into sync-from-upstream
eldang Jan 23, 2025
ef31861
added missing go.sum entry
eldang Jan 23, 2025
179783a
Merge pull request #7 from eldang/sync-from-upstream
eldang Jan 23, 2025
618c129
routine dependency updates
eldang Jan 23, 2025
febadaf
go mod tidy
eldang Jan 23, 2025
93a6145
Revert "go mod tidy"
eldang Jan 23, 2025
7e92152
Revert "routine dependency updates"
eldang Jan 23, 2025
1681c8b
Merge branch 'master' into dependency-updates
eldang Jan 23, 2025
1e42502
routine dependency updates
eldang Jan 23, 2025
4c5ab21
add missing source
eldang Jan 23, 2025
e53bfd8
go mod tidy
eldang Jan 23, 2025
3cbb0f6
Explicitly clean all old `golang.org/x/crypto` versions out
eldang Jan 23, 2025
3dfaac5
Use newer Alpine image
eldang Jan 23, 2025
3c86ebb
Merge pull request #8 from eldang/dependency-updates
eldang Jan 23, 2025
5de3019
Update that I forgot
eldang Jan 23, 2025
be48f6b
Merge pull request #9 from eldang/dependency-updates
eldang Jan 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# Lightweight Alpine-based pg_tileserv Docker Image
# Author: Just van den Broecke
FROM golang:1.21.3-alpine3.17
FROM golang:1.22.11-alpine3.21

# Build ARGS
ARG VERSION="latest-alpine-3.17"
ARG VERSION="latest-alpine-3.21"

RUN mkdir /app
ADD . /app/
WORKDIR /app
RUN go build -v -ldflags "-s -w -X main.programVersion=${VERSION}"

# Multi-stage build: only copy build result and resources
FROM alpine:3.17
FROM alpine:3.21

LABEL original_developer="Crunchy Data" \
contributor="Just van den Broecke <justb4@gmail.com>" \
vendor="Crunchy Data" \
url="https://crunchydata.com" \
release="${VERSION}" \
release="latest-alpine-3.21" \
org.opencontainers.image.vendor="Crunchy Data" \
os.version="3.17"
os.version="3.21"

RUN apk --no-cache add ca-certificates && mkdir /app
WORKDIR /app/
Expand All @@ -36,7 +36,7 @@ CMD []

# To build and run specific version
#
# export VERSION="latest-alpine-3.17"
# export VERSION="latest-alpine-3.21"
# docker build --build-arg VERSION=${VERSION} -t pramsey/pg_tileserv:${VERSION} -f Dockerfile.alpine
#
# Best is to use another PostGIS Docker Container whoose host is reachable from the pg_tileserv Container.
Expand Down
71 changes: 38 additions & 33 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,65 +1,70 @@
module github.com/CrunchyData/pg_tileserv

go 1.21
go 1.22.0

toolchain go1.23.4

require (
github.com/Masterminds/sprig/v3 v3.1.0
github.com/Masterminds/sprig/v3 v3.3.0
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220209173558-ad29539cd2e9
github.com/gorilla/handlers v1.5.2
github.com/gorilla/mux v1.8.1
github.com/jackc/pgconn v1.14.3
github.com/jackc/pgtype v1.14.0
github.com/jackc/pgx/v4 v4.18.2
github.com/jackc/pgtype v1.14.4
github.com/jackc/pgx/v4 v4.18.3
github.com/pborman/getopt/v2 v2.1.0
github.com/prometheus/client_golang v1.17.0
github.com/prometheus/client_golang v1.20.5
github.com/sirupsen/logrus v1.9.3
github.com/spf13/viper v1.17.0
github.com/stretchr/testify v1.8.4
github.com/spf13/viper v1.19.0
github.com/stretchr/testify v1.10.0
github.com/theckman/httpforwarded v0.4.0
)

require (
dario.cat/mergo v1.0.1 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/Masterminds/semver/v3 v3.3.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/huandu/xstrings v1.3.1 // indirect
github.com/imdario/mergo v0.3.8 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
github.com/jackc/puddle v1.3.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mitchellh/copystructure v1.0.0 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/magiconair/properties v1.8.9 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.0 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/sagikazarmark/locafero v0.3.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.62.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/sagikazarmark/locafero v0.7.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.10.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/afero v1.12.0 // indirect
github.com/spf13/cast v1.7.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/crypto v0.20.0 // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
google.golang.org/protobuf v1.36.3 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace golang.org/x/crypto => golang.org/x/crypto v0.32.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the specific dependency that was originally triggering static code analysis alerts because of https://nvd.nist.gov/vuln/detail/CVE-2024-45337 . I had to add the explicit replace because the static code analysis tool would alert on any mention of an affected version in go.sum. It may make sense to remove it for general purposes; I think the analysis tool raising alerts on those is bad behaviour.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the replace you mean?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. I don't know if it does any harm, but I just figure you probably don't want a random assortment of these starting to accumulate because of one very specific use case that I already have a fork for.

Loading
Loading