Skip to content

Commit eae39b9

Browse files
committed
Remove GPX fetch
1 parent 96bb88a commit eae39b9

File tree

6 files changed

+119
-177
lines changed

6 files changed

+119
-177
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ docker compose restart
107107
108108
Partial fetch
109109
```
110-
docker compose --profile tools run --rm fetcher bash -c 'ruby ./fetcher.rb foo'
110+
docker compose --profile tools run --rm fetcher ruby ./fetcher.rb foo
111111
```
112112
113113
Update the tiles cache in nginx:
@@ -117,7 +117,7 @@ docker compose --profile tools run --rm expire
117117
118118
Partial expire
119119
```
120-
docker compose --profile tools run --rm expire sh -c 'ruby ./get_tiles.rb foo'
120+
docker compose --profile tools run --rm expire ruby ./get_tiles.rb foo
121121
```
122122
123123
## Serve

docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ services:
3939
- SENTRY_DSN_FETCHER=${SENTRY_DSN_FETCHER:-}
4040
volumes:
4141
- ./data:/data
42-
command: bash -c 'ruby ./fetcher.rb'
42+
command: ruby ./fetcher.rb
4343

4444
expire:
4545
profiles:
@@ -52,7 +52,7 @@ services:
5252
- BYPASS=bypass
5353
volumes:
5454
- ./data:/data
55-
command: sh -c 'ruby ./get_tiles.rb'
55+
command: ruby ./get_tiles.rb
5656
depends_on:
5757
merge_proxy:
5858
condition: service_healthy

fetcher/Dockerfile

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM alpine:3.18
1+
FROM alpine:3.23
22

3-
ARG TIPPECANOE_RELEASE="2.44.0"
3+
ARG TIPPECANOE_RELEASE="2.79.0"
44

55
RUN apk add --no-cache bash git g++ make libgcc libstdc++ sqlite-libs sqlite-dev zlib-dev && \
66
git clone https://github.com/felt/tippecanoe.git tippecanoe && \
@@ -10,7 +10,15 @@ RUN apk add --no-cache bash git g++ make libgcc libstdc++ sqlite-libs sqlite-dev
1010
make install && \
1111
cd / && \
1212
rm -rf /tippecanoe
13-
RUN apk add --no-cache --virtual build-dependencies build-base bash curl ruby ruby-dev ruby-bundler ruby-json libffi-dev
13+
14+
RUN apk add --no-cache --virtual \
15+
bash \
16+
build-base \
17+
curl \
18+
libffi-dev \
19+
ruby \
20+
ruby-bundler \
21+
ruby-dev
1422

1523
ADD Gemfile .
1624
RUN bundle config --global silence_root_warning 1

fetcher/Gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@ source 'https://rubygems.org'
22

33
gem 'activesupport'
44
gem 'http'
5-
gem 'nokogiri'
65
gem 'sentry-ruby'
7-
gem 'webcache'
86
gem 'yaml'

fetcher/Gemfile.lock

Lines changed: 52 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,88 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.1.3.3)
4+
activesupport (8.1.1)
55
base64
66
bigdecimal
7-
concurrent-ruby (~> 1.0, >= 1.0.2)
7+
concurrent-ruby (~> 1.0, >= 1.3.1)
88
connection_pool (>= 2.2.5)
99
drb
1010
i18n (>= 1.6, < 2)
11+
json
12+
logger (>= 1.4.2)
1113
minitest (>= 5.1)
12-
mutex_m
13-
tzinfo (~> 2.0)
14-
addressable (2.8.6)
15-
public_suffix (>= 2.0.2, < 6.0)
16-
base64 (0.2.0)
17-
bigdecimal (3.1.8)
18-
concurrent-ruby (1.2.3)
19-
connection_pool (2.4.1)
14+
securerandom (>= 0.3)
15+
tzinfo (~> 2.0, >= 2.0.5)
16+
uri (>= 0.13.1)
17+
addressable (2.8.8)
18+
public_suffix (>= 2.0.2, < 8.0)
19+
base64 (0.3.0)
20+
bigdecimal (4.0.1)
21+
concurrent-ruby (1.3.6)
22+
connection_pool (3.0.2)
2023
domain_name (0.6.20240107)
21-
drb (2.2.1)
22-
ffi (1.16.3)
24+
drb (2.2.3)
25+
ffi (1.17.2)
26+
ffi (1.17.2-aarch64-linux-gnu)
27+
ffi (1.17.2-aarch64-linux-musl)
28+
ffi (1.17.2-arm-linux-gnu)
29+
ffi (1.17.2-arm-linux-musl)
30+
ffi (1.17.2-arm64-darwin)
31+
ffi (1.17.2-x86-linux-gnu)
32+
ffi (1.17.2-x86-linux-musl)
33+
ffi (1.17.2-x86_64-darwin)
34+
ffi (1.17.2-x86_64-linux-gnu)
35+
ffi (1.17.2-x86_64-linux-musl)
2336
ffi-compiler (1.3.2)
2437
ffi (>= 1.15.5)
2538
rake
26-
http (5.2.0)
39+
http (5.3.1)
2740
addressable (~> 2.8)
28-
base64 (~> 0.1)
2941
http-cookie (~> 1.0)
3042
http-form_data (~> 2.2)
3143
llhttp-ffi (~> 0.5.0)
32-
http-cookie (1.0.5)
44+
http-cookie (1.1.0)
3345
domain_name (~> 0.5)
3446
http-form_data (2.3.0)
35-
i18n (1.14.5)
47+
i18n (1.14.8)
3648
concurrent-ruby (~> 1.0)
37-
llhttp-ffi (0.5.0)
49+
json (2.18.0)
50+
llhttp-ffi (0.5.1)
3851
ffi-compiler (~> 1.0)
3952
rake (~> 13.0)
40-
minitest (5.23.1)
41-
mutex_m (0.2.0)
42-
nokogiri (1.16.5-x86_64-linux)
43-
racc (~> 1.4)
44-
public_suffix (5.0.5)
45-
racc (1.8.0)
46-
rake (13.2.1)
47-
sentry-ruby (5.17.3)
53+
logger (1.7.0)
54+
minitest (6.0.0)
55+
prism (~> 1.5)
56+
prism (1.7.0)
57+
public_suffix (7.0.0)
58+
rake (13.3.1)
59+
securerandom (0.4.1)
60+
sentry-ruby (6.2.0)
4861
bigdecimal
4962
concurrent-ruby (~> 1.0, >= 1.0.2)
5063
tzinfo (2.0.6)
5164
concurrent-ruby (~> 1.0)
52-
webcache (0.9.0)
53-
http (~> 5.0)
54-
yaml (0.3.0)
65+
uri (1.1.1)
66+
yaml (0.4.0)
5567

5668
PLATFORMS
57-
x86_64-linux
69+
aarch64-linux-gnu
70+
aarch64-linux-musl
71+
arm-linux-gnu
72+
arm-linux-musl
73+
arm64-darwin
74+
ruby
75+
x86-linux-gnu
76+
x86-linux-musl
77+
x86_64-darwin
78+
x86_64-linux-gnu
79+
x86_64-linux-musl
5880

5981
DEPENDENCIES
6082
activesupport
6183
http
62-
nokogiri
6384
sentry-ruby
64-
webcache
6585
yaml
6686

6787
BUNDLED WITH
68-
2.4.19
88+
2.7.2

0 commit comments

Comments
 (0)