Skip to content

Commit 8d0a9eb

Browse files
author
Rub21
committed
Fix issue with gem - ffi library and update minikube doc
1 parent de1f5aa commit 8d0a9eb

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

images/web/Dockerfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@ RUN bundle update mimemagic
132132
RUN bundle update listen && bundle install
133133
RUN gem install rake
134134

135+
# Install ffi for loading dynamically-linked native libraries
136+
RUN gem install ffi
137+
135138
# update vendored iD
136139
RUN rm -rf vendor/assets/iD
137140
RUN vendorer
@@ -162,12 +165,6 @@ RUN bundle exec rake i18n:js:export
162165
RUN sed -i -e 's/config.assets.js_compressor = :uglifier/config.assets.js_compressor = :terser/g' $workdir/config/environments/production.rb
163166
RUN bundle exec rake assets:precompile
164167

165-
# Loading dynamically-linked native libraries
166-
RUN gem install ffi
167-
168-
# Clean all installed gems for Ruby version
169-
RUN gem pristine --all
170-
171168
# The rack interface requires a `tmp` directory to use openstreetmap-cgimap
172169
RUN ln -s /tmp /var/www/tmp
173170

@@ -191,8 +188,10 @@ RUN apache2ctl configtest
191188
# Set Permissions for www-data
192189
RUN chown -R www-data: /var/www
193190

194-
195191
# Script to start the app
196192
ADD start.sh $workdir/start.sh
197193

194+
# Clean all installed gems for Ruby version
195+
RUN gem pristine --all
196+
198197
CMD $workdir/start.sh

osm-seed/README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ To delete all resources created in the Helm chart:
5050

5151
```sh
5252
minikube delete --all
53-
minikube start --mount-string=$PWD/data/:/mnt/ --mount
53+
minikube start --mount-string=$PWD/data/:/mnt/ --mount --driver=docker
5454
minikube ssh
5555
chartpress
5656
# It is necesary to create the folder in the shared folder
@@ -63,10 +63,16 @@ mkdir -p $PWD/data/nominatim-db-data
6363

6464
# Install develop version
6565
helm install develop osm-seed -f osm-seed/values.yaml
66+
67+
# Expose web contianer service
68+
minikube service develop-osm-seed-web --url
69+
6670
# Update develop version
6771
helm upgrade develop osm-seed -f osm-seed/values.yaml
72+
6873
# Delete develop version
6974
helm delete develop
75+
7076
```
7177

7278
### Additional Notes

0 commit comments

Comments
 (0)