#45: Welcome screen works again (tested with Uwazi v1.123.2); but sti…

…ll requires more testing with the application itself

README.md

@@ -42,7 +42,7 @@ docker compose run -e IS_FIRST_RUN=true --rm uwazi # Install/Re-install from emp
 docker compose up -d uwazi # Run uwazi on background (automatic restart on reboot unless stopped)
 ```
 
-Open your browser at <http://localhost:3000/>. Initial user: _admin_, password: _admin_.
+Open your browser at <http://localhost:3000/>. Initial user: `admin`, password: `change this password now`.
 
 ### Basic docker commands
 
@@ -146,6 +146,7 @@ docker compose --file docker compose.yml run -e IS_FIRST_RUN=true --rm uwazi
 # (...)
 docker stop $(docker ps -a -q)
 docker system prune --all
+docker volume prune
 
 # debug containers
 docker ps

docker-compose.yml

@@ -20,25 +20,43 @@ services:
       - elasticsearch
       - mongo
 
+  # elasticsearch:
+  #   # image: docker.elastic.co/elasticsearch/elasticsearch:5.5.3
+  #   # Based on https://github.com/huridocs/uwazi/releases/tag/1.123.2 . Please update this part in future
+  #   image: docker.elastic.co/elasticsearch/elasticsearch:7.17.6
+  #   restart: unless-stopped
+  #   # command: elasticsearch -Expack.security.enabled=false -Ecluster.name=docker-cluster -Ehttp.port=9200 -Ehttp.cors.allow-origin="http://localhost:51000" -Ehttp.cors.enabled=true -Ehttp.cors.allow-headers=X-Requested-With,X-Auth-Token,Content-Type,Content-Length,Authorization -Ehttp.cors.allow-credentials=true
+  #   command: elasticsearch -Expack.security.enabled=false -Ehttp.port=9200 -Ehttp.cors.allow-origin="http://localhost:51000" -Ehttp.cors.enabled=true -Ehttp.cors.allow-headers=X-Requested-With,X-Auth-Token,Content-Type,Content-Length,Authorization -Ehttp.cors.allow-credentials=true
+  #   environment:
+  #     # - cluster.name=docker-cluster
+  #     - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+  #     # - xpack.security.enabled=false
+  #   ulimits:
+  #     memlock:
+  #       soft: -1
+  #       hard: -1
+  #   volumes:
+  #     - elasticsearch_data1:/usr/share/elasticsearch/data
+  #   # Close these ports. No unprotected elasticsearch should be published.
+  #   # ports:
+  #   #  - 9200:9200
+
   elasticsearch:
-    # image: docker.elastic.co/elasticsearch/elasticsearch:5.5.3
-    # Based on https://github.com/huridocs/uwazi/releases/tag/1.123.2 . Please update this part in future
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.6
-    restart: unless-stopped
-    command: elasticsearch -Expack.security.enabled=false -Ecluster.name=docker-cluster -Ehttp.port=9200 -Ehttp.cors.allow-origin="http://localhost:51000" -Ehttp.cors.enabled=true -Ehttp.cors.allow-headers=X-Requested-With,X-Auth-Token,Content-Type,Content-Length,Authorization -Ehttp.cors.allow-credentials=true
-    environment:
-      - cluster.name=docker-cluster
-      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-      # - xpack.security.enabled=false
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
+    build:
+      context: .
+      dockerfile: elastic-icu-7.17.6.Dockerfile
+    # container_name: uwazi-elasticsearch
     volumes:
+      # - esdata01:/usr/share/elasticsearch/data
       - elasticsearch_data1:/usr/share/elasticsearch/data
-    # Close these ports. No unprotected elasticsearch should be published.
-    # ports:
-    #  - 9200:9200
+    ports:
+      - '9200:9200'
+    environment:
+      - bootstrap.memory_lock=true
+      - indices.query.bool.max_clause_count=2048
+      - discovery.type=single-node
+      - 'ES_JAVA_OPTS=-Xms2g -Xmx2g'
+      - cluster.routing.allocation.disk.threshold_enabled=false
 
   # dejavu "The Missing Web UI for Elasticsearch"
   # See https://github.com/appbaseio/dejavu

docker-entrypoint.sh

@@ -21,6 +21,8 @@ if [ "$IS_FIRST_RUN" = "true" ] ; then
     mongorestore -h "${DBHOST:-mongo}" "$DB_INITIALIZATION_PATH" --db="${DATABASE_NAME:-uwazi_development}"
 
     echo "uwazi-docker: Applyng yarn reindex. This will use data from MongoDB to feed Elastic Search"
+    # yarn reindex
+    yarn migrate
     yarn reindex
 
     echo "uwazi-docker: If no fatal errors occurred, you will not need to use this command again"

elastic-icu-7.17.6.Dockerfile

@@ -0,0 +1,2 @@
+FROM elasticsearch:7.17.6
+RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install analysis-icu