Bump stable to 2.29.0

Author: qlands

README.md

@@ -114,11 +114,11 @@ ScreenShot
 
 Releases
 ------------
-The current stable release is 2.28.0 and it is available [here](https://github.com/qlands/FormShare/tree/stable-2.28.0) 
+The current stable release is 2.29.0 and it is available [here](https://github.com/qlands/FormShare/tree/stable-2.29.0) 
 
-The database signature for stable 2.28.0 is 1903afedb92d
+The database signature for stable 2.29.0 is 1903afedb92d
 
-The Docker image for stable 2.28.0 is 20230911
+The Docker image for stable 2.29.0 is 20230924
 
 Requires ODKTools [2.5](https://github.com/qlands/odktools/releases/tag/2.5)
 
@@ -140,9 +140,9 @@ sudo apt-get install -y docker-compose
 
 # Get the Docker Compose file
 cd /opt
-sudo mkdir formshare_docker_compose_20230911
-cd formshare_docker_compose_20230911
-sudo wget https://raw.githubusercontent.com/qlands/FormShare/stable-2.28.0/docker_compose/docker-compose.yml
+sudo mkdir formshare_docker_compose_20230924
+cd formshare_docker_compose_20230924
+sudo wget https://raw.githubusercontent.com/qlands/FormShare/stable-2.29.0/docker_compose/docker-compose.yml
 
 # Make the directory structure for FormShare
 sudo mkdir /opt/formshare
@@ -167,11 +167,11 @@ sudo sysctl -w vm.max_map_count=262144
 echo 'vm.max_map_count=262144' | sudo tee -a /etc/sysctl.d/60-vm-max_map_count.conf
 
 # Download all the required Docker Images
-cd /opt/formshare_docker_compose_20230911
+cd /opt/formshare_docker_compose_20230924
 sudo docker-compose pull
 
 # Edit the docker-compose.yml file to set the MySQL root and FormShare admin passwords
-sudo nano /opt/formshare_docker_compose_20230911/docker-compose.yml
+sudo nano /opt/formshare_docker_compose_20230924/docker-compose.yml
 # Press Alt+Shit+3 to show the line numbers in Nano
 
 Edit line 10: Change the root password from "my_secure_password" to your password
@@ -219,7 +219,7 @@ sudo service apache2 start
 # Subsequent start will take about 2 minutes. You can check the status with "sudo docker stats". 
 # FormShare will be ready for usage when the container reaches more than 500 kB of MEM USAGE
 # This is the only two commands you need to start FormShare after a server restart
-cd /opt/formshare_docker_compose_20230911
+cd /opt/formshare_docker_compose_20230924
 sudo docker-compose up -d
 
 # Browse to FormShare

docker_compose/docker-compose.yml

@@ -1,9 +1,9 @@
 version: '3'
 services:
-  fsmysql_20230911:
+  fsmysql_20230924:
     image: mysql:8.0.23
     command: --default-authentication-plugin=mysql_native_password
-    container_name: fs_mysql_20230911
+    container_name: fs_mysql_20230924
     cap_add:
       - SYS_NICE
     environment:
@@ -15,15 +15,15 @@ services:
       fsnet:
         ipv4_address: 172.28.1.5
 
-  fses20230911n01:
+  fses20230924n01:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.14.2
-    container_name: fses20230911n01
+    container_name: fses20230924n01
     environment:
       - network.host=172.28.1.1
-      - node.name=fses20230911n01
+      - node.name=fses20230924n01
       - cluster.name=fs-es-cluster
-      - discovery.seed_hosts=fses20230911n02
-      - cluster.initial_master_nodes=fses20230911n01,fses20230911n02
+      - discovery.seed_hosts=fses20230924n02
+      - cluster.initial_master_nodes=fses20230924n01,fses20230924n02
       - bootstrap.memory_lock=true
       - xpack.security.enabled=false
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
@@ -37,15 +37,15 @@ services:
       fsnet:
         ipv4_address: 172.28.1.1
 
-  fses20230911n02:
+  fses20230924n02:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.14.2
-    container_name: fses20230911n02
+    container_name: fses20230924n02
     environment:
       - network.host=172.28.1.2
-      - node.name=fses20230911n02
+      - node.name=fses20230924n02
       - cluster.name=fs-es-cluster
-      - discovery.seed_hosts=fses20230911n01
-      - cluster.initial_master_nodes=fses20230911n01,fses20230911n02
+      - discovery.seed_hosts=fses20230924n01
+      - cluster.initial_master_nodes=fses20230924n01,fses20230924n02
       - bootstrap.memory_lock=true
       - xpack.security.enabled=false
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
@@ -59,9 +59,9 @@ services:
       fsnet:
         ipv4_address: 172.28.1.2
 
-  formshare_20230911:
-    image: qlands/formshare2:20230911
-    container_name: formshare_20230911
+  formshare_20230924:
+    image: qlands/formshare2:20230924
+    container_name: formshare_20230924
     environment:
       MYSQL_HOST_NAME: 172.28.1.5
       MYSQL_USER_NAME: root
@@ -95,4 +95,4 @@ networks:
      ipam:
         driver: default
         config:
-          - subnet: 172.28.0.0/16
+          - subnet: 172.29.0.0/16

docker_files/formshare/build_stable.sh

@@ -1 +1 @@
-sudo docker build --no-cache --rm -t qlands/formshare2:20230911 -f ./stable.Dockerfile .
+sudo docker build --no-cache --rm -t qlands/formshare2:20230924 -f ./stable.Dockerfile .

docker_files/formshare/stable.Dockerfile

@@ -30,7 +30,7 @@ COPY ./docker_files/mosquitto/access.acl /root
 RUN mkdir formshare_gunicorn
 RUN python3 -m venv formshare_env
 
-RUN git clone https://github.com/qlands/FormShare.git -b stable-2.28.0 formshare
+RUN git clone https://github.com/qlands/FormShare.git -b stable-2.29.0 formshare
 RUN . ./formshare_env/bin/activate && pip install wheel && pip install -r /opt/formshare/requirements.txt && python /opt/formshare/download_nltk_packages.py
 
 ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.6.0/wait /wait

formshare/jsandcss/font-awesome/metadata/icons.json

@@ -113,7 +113,7 @@ def get_version():
     This returns the version of FormShare
     :return: The version of FormShare
     """
-    return "2.28.0 (20230911)"
+    return "2.29.0 (20230924)"
 
 
 @core_helper

formshare/plugins/helpers.py

@@ -267,7 +267,7 @@ sudo chown -R $whoami formshare_env
 
 ```sh
 cd /opt
-sudo git clone https://github.com/qlands/FormShare.git -b stable-2.28.0 formshare
+sudo git clone https://github.com/qlands/FormShare.git -b stable-2.29.0 formshare
 sudo chown -R $whoami formshare
 ```
 

install_steps.md

@@ -173,7 +173,7 @@
 
 setup(
     name="formshare",
-    version="2.28.0",
+    version="2.29.0",
     description="FormShare",
     long_description=README + "\n\n" + CHANGES,
     classifiers=[