Skip to content

Commit fb0e0a0

Browse files
committed
bump gems
- update geoserver pull
1 parent 4b476e1 commit fb0e0a0

3 files changed

Lines changed: 13 additions & 14 deletions

File tree

Gemfile

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

33
ruby File.read('.ruby-version')
44

5-
gem 'berkeley_library-logging', '~> 0.2'
5+
gem 'berkeley_library-logging', '~> 0.3'
66
gem 'faraday-net_http_persistent', '~> 2.0'
77
gem 'geo_combine'
8-
gem 'geoserver-publish', '~> 0.7.0'
8+
gem 'geoserver-publish', '~> 1.0'
99
gem 'rsolr'
1010
gem 'rubyzip', '~> 3.0'
1111
gem "berkeley_library-docker", "~> 0.2.0"
1212
gem "listen", "~> 3.8"
1313
gem 'uri'
1414

1515
group :dev do
16-
gem "pry", "~> 0.14.2"
16+
gem "pry", "~> 0.16"
1717
end
1818

1919
group :test do

Gemfile.lock

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ GEM
7878
rsolr
7979
sanitize
8080
thor
81-
geoserver-publish (0.7.0)
81+
geoserver-publish (1.0.0)
8282
faraday (~> 2.2)
8383
git (4.3.2)
8484
activesupport (>= 5.0)
@@ -138,9 +138,10 @@ GEM
138138
prism (1.9.0)
139139
process_executer (4.0.4)
140140
track_open_instances (~> 0.1)
141-
pry (0.14.2)
141+
pry (0.16.0)
142142
coderay (~> 1.1)
143143
method_source (~> 1.0)
144+
reline (>= 0.6.0)
144145
psych (5.4.0)
145146
date
146147
stringio
@@ -222,12 +223,12 @@ PLATFORMS
222223

223224
DEPENDENCIES
224225
berkeley_library-docker (~> 0.2.0)
225-
berkeley_library-logging (~> 0.2)
226+
berkeley_library-logging (~> 0.3)
226227
faraday-net_http_persistent (~> 2.0)
227228
geo_combine
228-
geoserver-publish (~> 0.7.0)
229+
geoserver-publish (~> 1.0)
229230
listen (~> 3.8)
230-
pry (~> 0.14.2)
231+
pry (~> 0.16)
231232
rsolr
232233
rspec (~> 3.12)
233234
rubyzip (~> 3.0)

docker-compose.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,29 +51,27 @@ services:
5151
- ./data/spatial:/usr/local/apache2/htdocs/:ro
5252

5353
geoserver:
54-
image: containers.lib.berkeley.edu/gis/geoserver:production
55-
platform: linux/amd64
54+
image: ghcr.io/berkeleylibrary/geoserver:latest
5655
ports:
5756
- 8080:8080
5857
healthcheck:
5958
test: ["CMD", "curl", "-f", "http://localhost:8080/geoserver/web/"]
6059
interval: 15s
6160
timeout: 10s
6261
retries: 10
63-
start_period: 120s
62+
start_period: 30s
6463
volumes:
6564
- ./data/geoserver/public:/srv/geofiles:delegated
6665

6766
geoserver-secure:
68-
image: containers.lib.berkeley.edu/gis/geoserver:production
69-
platform: linux/amd64
67+
image: ghcr.io/berkeleylibrary/geoserver:latest
7068
ports:
7169
- 8081:8080
7270
healthcheck:
7371
test: ["CMD", "curl", "-f", "http://localhost:8080/geoserver/web/"]
7472
interval: 15s
7573
timeout: 10s
7674
retries: 10
77-
start_period: 120s
75+
start_period: 30s
7876
volumes:
7977
- ./data/geoserver/UCB:/srv/geofiles:delegated

0 commit comments

Comments
 (0)