Bump stable to 2.29.1

Author: qlands

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   py-3.10: &build-template
     docker:
-      - image: qlands/odktools_circleci:20230811
+      - image: qlands/odktools_circleci:20230929
       - image: docker.elastic.co/elasticsearch/elasticsearch:7.14.0
         environment:
           - bootstrap.memory_lock=true

README.md

@@ -114,13 +114,13 @@ ScreenShot
 
 Releases
 ------------
-The current stable release is 2.29.0 and it is available [here](https://github.com/qlands/FormShare/tree/stable-2.29.0) 
+The current stable release is 2.29.1 and it is available [here](https://github.com/qlands/FormShare/tree/stable-2.29.1) 
 
-The database signature for stable 2.29.0 is 1903afedb92d
+The database signature for stable 2.29.1 is 1903afedb92d
 
-The Docker image for stable 2.29.0 is 20230924
+The Docker image for stable 2.29.1 is 20230930
 
-Requires ODKTools [2.5](https://github.com/qlands/odktools/releases/tag/2.5)
+Requires ODKTools [2.5.1](https://github.com/qlands/odktools/releases/tag/2.5.1)
 
 Installation
 ------------
@@ -140,9 +140,9 @@ sudo apt-get install -y docker-compose
 
 # Get the Docker Compose file
 cd /opt
-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
+sudo mkdir formshare_docker_compose_20230930
+cd formshare_docker_compose_20230930
+sudo wget https://raw.githubusercontent.com/qlands/FormShare/stable-2.29.1/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_20230924
+cd /opt/formshare_docker_compose_20230930
 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_20230924/docker-compose.yml
+sudo nano /opt/formshare_docker_compose_20230930/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_20230924
+cd /opt/formshare_docker_compose_20230930
 sudo docker-compose up -d
 
 # Browse to FormShare

docker_compose/docker-compose.yml

@@ -1,9 +1,9 @@
 version: '3'
 services:
-  fsmysql_20230924:
+  fsmysql_20230930:
     image: mysql:8.0.23
     command: --default-authentication-plugin=mysql_native_password
-    container_name: fs_mysql_20230924
+    container_name: fs_mysql_20230930
     cap_add:
       - SYS_NICE
     environment:
@@ -15,15 +15,15 @@ services:
       fsnet:
         ipv4_address: 172.28.1.5
 
-  fses20230924n01:
+  fses20230930n01:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.14.2
-    container_name: fses20230924n01
+    container_name: fses20230930n01
     environment:
       - network.host=172.28.1.1
-      - node.name=fses20230924n01
+      - node.name=fses20230930n01
       - cluster.name=fs-es-cluster
-      - discovery.seed_hosts=fses20230924n02
-      - cluster.initial_master_nodes=fses20230924n01,fses20230924n02
+      - discovery.seed_hosts=fses20230930n02
+      - cluster.initial_master_nodes=fses20230930n01,fses20230930n02
       - 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
 
-  fses20230924n02:
+  fses20230930n02:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.14.2
-    container_name: fses20230924n02
+    container_name: fses20230930n02
     environment:
       - network.host=172.28.1.2
-      - node.name=fses20230924n02
+      - node.name=fses20230930n02
       - cluster.name=fs-es-cluster
-      - discovery.seed_hosts=fses20230924n01
-      - cluster.initial_master_nodes=fses20230924n01,fses20230924n02
+      - discovery.seed_hosts=fses20230930n01
+      - cluster.initial_master_nodes=fses20230930n01,fses20230930n02
       - 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_20230924:
-    image: qlands/formshare2:20230924
-    container_name: formshare_20230924
+  formshare_20230930:
+    image: qlands/formshare2:20230930
+    container_name: formshare_20230930
     environment:
       MYSQL_HOST_NAME: 172.28.1.5
       MYSQL_USER_NAME: root
@@ -95,4 +95,4 @@ networks:
      ipam:
         driver: default
         config:
-          - subnet: 172.29.0.0/16
+          - subnet: 172.29.1.0/16

docker_files/formshare/build_ci.sh

@@ -1 +1 @@
-sudo docker build --rm -t qlands/odktools_circleci:20230811 -f ./circleci.Dockerfile .
+sudo docker build --rm -t qlands/odktools_circleci:20230929 -f ./circleci.Dockerfile .

docker_files/formshare/build_odktools.sh

@@ -1 +1 @@
-sudo docker build --no-cache --rm -t qlands/odktools:20230722 -f ./odktools.Dockerfile .
+sudo docker build --no-cache --rm -t qlands/odktools:20230929 -f ./odktools.Dockerfile .

docker_files/formshare/build_stable.sh

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

docker_files/formshare/circleci.Dockerfile

@@ -62,7 +62,7 @@ WORKDIR /home/circleci/project
 
 WORKDIR /opt
 RUN sudo mkdir odktools-deps
-RUN sudo git clone https://github.com/qlands/odktools.git -b stable-2.5
+RUN sudo git clone https://github.com/qlands/odktools.git -b stable-2.5.1
 
 WORKDIR /opt/odktools-deps
 RUN sudo wget https://github.com/mongodb/mongo-c-driver/releases/download/1.21.1/mongo-c-driver-1.21.1.tar.gz

docker_files/formshare/master.Dockerfile

@@ -1,4 +1,4 @@
-FROM qlands/odktools:20230513
+FROM qlands/odktools:20230929
 
 MAINTAINER QLands Technology Consultants
 

docker_files/formshare/odktools.Dockerfile

@@ -37,7 +37,7 @@ RUN cp csv2xlsx /bin
 
 WORKDIR /opt
 RUN mkdir odktools-deps
-RUN git clone https://github.com/qlands/odktools.git -b stable-2.5
+RUN git clone https://github.com/qlands/odktools.git -b stable-2.5.1
 
 WORKDIR /opt/odktools-deps
 RUN wget https://github.com/mongodb/mongo-c-driver/releases/download/1.21.1/mongo-c-driver-1.21.1.tar.gz

docker_files/formshare/stable.Dockerfile

@@ -1,4 +1,4 @@
-FROM qlands/odktools:20230722
+FROM qlands/odktools:20230929
 
 MAINTAINER QLands Technology Consultants
 
@@ -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.29.0 formshare
+RUN git clone https://github.com/qlands/FormShare.git -b stable-2.29.1 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/plugins/helpers.py

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

install_steps.md

@@ -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.29.0 formshare
+sudo git clone https://github.com/qlands/FormShare.git -b stable-2.29.1 formshare
 sudo chown -R $whoami formshare
 ```
 

requirements.txt

@@ -40,7 +40,7 @@ exceptiongroup==1.1.2
 feedparser==6.0.10
 FormEncode==2.0.1
 future==0.18.3
-gevent==23.7.0
+gevent==23.9.1
 greenlet==2.0.2
 gunicorn==21.2.0
 hupper==1.12

setup.py

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