Merge pull request #220 from developmentseed/version/oxipng

Set version for oxipng library and Ruby platform issue

Author: Ruben L. Mendoza

images/web/Dockerfile

@@ -123,14 +123,18 @@ RUN echo "gem 'terser', '~> 1.1.3'" >> Gemfile
 # RUN gem install nokogiri -- --use-system-libraries
 
 RUN apt-get install -y cargo
-RUN git clone https://github.com/shssoichiro/oxipng.git
+# Set version 5.0.1 for oxipng
+RUN git clone https://github.com/shssoichiro/oxipng.git && cd oxipng && git checkout c888142bcb7a68a430245cb3eae5b6039aeb0e56
 RUN cd oxipng && cargo build --release && cp target/release/oxipng /usr/local/bin
 
 # Install app dependencies
 RUN bundle update mimemagic
 RUN bundle update listen && bundle install
 RUN gem install rake
 
+# Install ffi for loading dynamically-linked native libraries 
+RUN gem install ffi
+
 # update vendored iD
 RUN rm -rf vendor/assets/iD
 RUN vendorer
@@ -154,6 +158,7 @@ ADD config/action_mailer.rb config/initializers/action_mailer.rb
 # Precompile the website assets
 RUN apt-get install -y tzdata
 RUN npm install yarn -g
+
 RUN bundle exec rake yarn:install
 RUN bundle exec rake i18n:js:export
 # From https://github.com/lautis/uglifier#readme
@@ -183,6 +188,9 @@ RUN apache2ctl configtest
 # Set Permissions for www-data
 RUN chown -R www-data: /var/www
 
+# Clean all installed gems for Ruby version
+RUN gem pristine --all
+
 # Script to start the app
 ADD start.sh $workdir/start.sh
 

images/web/start.sh

@@ -21,10 +21,10 @@ production:
 # # Set up iD key
 # sed -i -e 's/id-key-to-be-replaced/'$OSM_id_key'/g' $workdir/config/application.yml
 
-
+# Fix issues with platform
+bundle config force_ruby_platform true
 
 # Check if DB is already up
-
 flag=true
 while "$flag" = true; do
   pg_isready -h $POSTGRES_HOST -p 5432 >/dev/null 2>&2 || continue
@@ -46,5 +46,3 @@ while "$flag" = true; do
   # Start the app
   apachectl -k start -DFOREGROUND
 done
-
-

osm-seed/README.md

@@ -50,7 +50,7 @@ To delete all resources created in the Helm chart:
 
 ```sh
 minikube delete --all
-minikube start --mount-string=$PWD/data/:/mnt/ --mount
+minikube start --mount-string=$PWD/data/:/mnt/ --mount --driver=docker
 minikube ssh
 chartpress
 # It is necesary to create the folder in the shared folder 
@@ -63,10 +63,16 @@ mkdir -p $PWD/data/nominatim-db-data
 
 # Install develop version
 helm install develop osm-seed -f osm-seed/values.yaml
+
+# Expose web contianer service
+minikube service develop-osm-seed-web --url
+
 # Update develop version
 helm upgrade develop osm-seed -f osm-seed/values.yaml
+
 # Delete develop version
 helm delete develop
+
 ```
 
 ### Additional Notes