Merge branch 'staging'

images/web/Dockerfile

@@ -48,13 +48,13 @@ RUN npm install -g svgo
 
 # Install openstreetmap-website
 RUN rm -rf $workdir/html
-ENV OPENHISTORICALMAP_WEBSITE_GITSHA=a71a6b795dda0d9c908495cf8862fdb8e9bf02e3
+ENV OPENHISTORICALMAP_WEBSITE_GITSHA=81b23e55aa9572f8d209a390c8a4e759cfc6520e
 RUN git clone -b staging https://github.com/OpenHistoricalMap/ohm-website.git $workdir
 WORKDIR $workdir
 RUN git checkout $OPENHISTORICALMAP_WEBSITE_GITSHA
 
 # change the echo here with a reason for changing the commithash
-RUN echo 'fix locale file for comment username'
+RUN echo 'update map style'
 RUN git fetch
 
 # Install Ruby packages

ohm/requirements.yaml

@@ -1,4 +1,4 @@
 dependencies:
 - name: osm-seed
-  version: '0.1.0-n808.hbf9aacf'
+  version: '0.1.0-n812.h5a34712'
   repository: https://devseed.com/osm-seed-chart/

values.staging.template.yaml

@@ -118,19 +118,19 @@ osm-seed:
         NEW_RELIC_LICENSE_KEY: {{STAGING_NEW_RELIC_LICENSE_KEY}}
         NEW_RELIC_APP_NAME: {{STAGING_NEW_RELIC_APP_NAME}}
       resources:
-        enabled: false
+        enabled: true
         requests:
           memory: "2Gi"
           cpu: "1"
         limits:
-          memory: "2Gi"
+          memory: "4Gi"
           cpu: "2"
       autoscaling:
-        enabled: true
+        enabled: false
         minReplicas: 2
         maxReplicas: 10
         cpuUtilization: 80
-      sharedMemorySize: 128Mi
+      sharedMemorySize: 16Mi
     # ====================================================================================================
     # Variables for memcached. Memcached is used to store session cookies
     # ====================================================================================================
@@ -295,6 +295,7 @@ osm-seed:
           # Clean up backups options
           CLEANUP_BACKUPS: true
           RETENTION_DAYS: '30'
+          RESTORE_URL_FILE: https://osmseed.s3.amazonaws.com/test.sql.gz
         resources:
           enabled: false
           requests: