Bumping stable to 2.7.2

qlands · Feb 4, 2021 · 58ff806 · 58ff806
1 parent da3b69b
commit 58ff806
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -65,11 +65,11 @@ ScreenShot
 
 Releases
 ------------
-The current stable release is 2.7.1 and it is available [here](https://github.com/qlands/FormShare/tree/stable-2.7.1) 
+The current stable release is 2.7.2 and it is available [here](https://github.com/qlands/FormShare/tree/stable-2.7.2) 
 
-The database signature for stable 2.7.1 is 6b09c0218d0b
+The database signature for stable 2.7.2 is 77d7e4daa88d
 
-The Docker image for stable 2.7.1 is 20210121
+The Docker image for stable 2.7.2 is 20210204
 
 Installation
 ------------
@@ -89,11 +89,11 @@ sudo apt-get install -y docker-compose
 
 # Collect the FormShare source code
 cd /opt
-sudo git clone https://github.com/qlands/FormShare.git -b stable-2.7.1 formshare_source
+sudo git clone https://github.com/qlands/FormShare.git -b stable-2.7.2 formshare_source
 
 # Copy the docker compose file from the source to a new directory
-sudo mkdir formshare_docker_compose_20210121
-sudo cp ./formshare_source/docker_compose/docker-compose.yml ./formshare_docker_compose_20210121/
+sudo mkdir formshare_docker_compose_20210204
+sudo cp ./formshare_source/docker_compose/docker-compose.yml ./formshare_docker_compose_20210204/
 
 # Make the directory structure for FormShare
 sudo mkdir /opt/formshare
@@ -116,11 +116,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_20210121
+cd /opt/formshare_docker_compose_20210204
 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_20210121/docker-compose.yml
+sudo nano /opt/formshare_docker_compose_20210204/docker-compose.yml
 # Press Alt+Shit+3 to show the line numbers in Nano
 
 Edit line 7: Change the root password from "my_secure_password" to your password
@@ -168,7 +168,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_20210121
+cd /opt/formshare_docker_compose_20210204
 sudo docker-compose up -d
 
 # Browse to FormShare

diff --git a/docker_compose/docker-compose.yml b/docker_compose/docker-compose.yml
@@ -1,8 +1,8 @@
 version: '3'
 services:
-  fsmysql_20210121:
+  fsmysql_20210204:
     image: mysql:5.7.27
-    container_name: fs_mysql_20210121
+    container_name: fs_mysql_20210204
     environment:
       MYSQL_ROOT_PASSWORD: my_secure_password
     volumes:
@@ -11,9 +11,9 @@ services:
       fsnet:
         ipv4_address: 172.28.1.5
 
-  fselasticsearch_20210121:
+  fselasticsearch_20210204:
     image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2
-    container_name: fs_elasticsearch_20210121
+    container_name: fs_elasticsearch_20210204
     environment:
       - cluster.name=docker-cluster
       - bootstrap.memory_lock=true
@@ -29,9 +29,9 @@ services:
       fsnet:
         ipv4_address: 172.28.1.1
 
-  fselasticsearch2_20210121:
+  fselasticsearch2_20210204:
     image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2
-    container_name: fs_elasticsearch2_20210121
+    container_name: fs_elasticsearch2_20210204
     environment:
       - cluster.name=docker-cluster
       - bootstrap.memory_lock=true
@@ -48,9 +48,9 @@ services:
       fsnet:
         ipv4_address: 172.28.1.2
 
-  formshare_20210121:
-    image: qlands/formshare2:20210121
-    container_name: formshare_20210121
+  formshare_20210204:
+    image: qlands/formshare2:20210204
+    container_name: formshare_20210204
     environment:
       MYSQL_HOST_NAME: 172.28.1.5
       MYSQL_USER_NAME: root

diff --git a/docker_compose_with_apache/docker-compose.yml b/docker_compose_with_apache/docker-compose.yml
@@ -1,8 +1,8 @@
 version: '3'
 services:
-  fsmysql_20210121:
+  fsmysql_20210204:
     image: mysql:5.7.27
-    container_name: fs_mysql_20210121
+    container_name: fs_mysql_20210204
     environment:
       MYSQL_ROOT_PASSWORD: my_secure_password
     volumes:
@@ -11,9 +11,9 @@ services:
       fsnet:
         ipv4_address: 172.28.1.5
 
-  fselasticsearch_20210121:
+  fselasticsearch_20210204:
     image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2
-    container_name: fs_elasticsearch_20210121
+    container_name: fs_elasticsearch_20210204
     environment:
       - cluster.name=docker-cluster
       - bootstrap.memory_lock=true
@@ -28,9 +28,9 @@ services:
     networks:
       fsnet:
         ipv4_address: 172.28.1.1
-  fselasticsearch2_20210121:
+  fselasticsearch2_20210204:
     image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2
-    container_name: fs_elasticsearch2_20210121
+    container_name: fs_elasticsearch2_20210204
     environment:
       - cluster.name=docker-cluster
       - bootstrap.memory_lock=true
@@ -46,9 +46,9 @@ services:
     networks:
       fsnet:
         ipv4_address: 172.28.1.2
-  fselasticsearch3_20210121:
+  fselasticsearch3_20210204:
     image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2
-    container_name: fs_elasticsearch3_20210121
+    container_name: fs_elasticsearch3_20210204
     environment:
       - cluster.name=docker-cluster
       - bootstrap.memory_lock=true
@@ -64,9 +64,9 @@ services:
     networks:
       fsnet:
         ipv4_address: 172.28.1.3
-  formshare_20210121:
-    image: qlands/formshare2:20210121
-    container_name: formshare_20210121
+  formshare_20210204:
+    image: qlands/formshare2:20210204
+    container_name: formshare_20210204
     environment:
       MYSQL_HOST_NAME: 172.28.1.5
       MYSQL_USER_NAME: root
@@ -97,9 +97,9 @@ services:
       fsnet: 
         ipv4_address: 172.28.1.4
 
-  fsapache_20210121:
+  fsapache_20210204:
     image: qlands/httpd:2.4
-    container_name: fsapache_20210121
+    container_name: fsapache_20210204
     ports:
       - 80:80
     networks:

diff --git a/docker_compose_with_fluentd/docker-compose.yml b/docker_compose_with_fluentd/docker-compose.yml
@@ -1,8 +1,8 @@
 version: '3'
 services:
-  fsmysql_20210121:
+  fsmysql_20210204:
     image: mysql:5.7.27
-    container_name: fs_mysql_20210121
+    container_name: fs_mysql_20210204
     environment:
       MYSQL_ROOT_PASSWORD: my_secure_password
     volumes:
@@ -11,9 +11,9 @@ services:
       fsnet:
         ipv4_address: 172.28.1.5
 
-  fselasticsearch_20210121:
+  fselasticsearch_20210204:
     image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2
-    container_name: fs_elasticsearch_20210121
+    container_name: fs_elasticsearch_20210204
     environment:
       - cluster.name=docker-cluster
       - bootstrap.memory_lock=true
@@ -28,9 +28,9 @@ services:
     networks:
       fsnet:
         ipv4_address: 172.28.1.1
-  fselasticsearch2_20210121:
+  fselasticsearch2_20210204:
     image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2
-    container_name: fs_elasticsearch2_20210121
+    container_name: fs_elasticsearch2_20210204
     environment:
       - cluster.name=docker-cluster
       - bootstrap.memory_lock=true
@@ -46,9 +46,9 @@ services:
     networks:
       fsnet:
         ipv4_address: 172.28.1.2
-  fselasticsearch_202101213:
+  fselasticsearch_202102043:
     image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2
-    container_name: fs_elasticsearch3_20210121
+    container_name: fs_elasticsearch3_20210204
     environment:
       - cluster.name=docker-cluster
       - bootstrap.memory_lock=true
@@ -64,9 +64,9 @@ services:
     networks:
       fsnet:
         ipv4_address: 172.28.1.3
-  formshare_20210121:
-    image: qlands/formshare2:20210121
-    container_name: formshare_20210121
+  formshare_20210204:
+    image: qlands/formshare2:20210204
+    container_name: formshare_20210204
     environment:
       MYSQL_HOST_NAME: 172.28.1.5
       MYSQL_USER_NAME: root
@@ -97,9 +97,9 @@ services:
       fsnet: 
         ipv4_address: 172.28.1.4
 
-  fsfluentd_20210121:
+  fsfluentd_20210204:
     image: qlands/fluentd:v1.7.3-1.0
-    container_name: fsfluentd_20210121
+    container_name: fsfluentd_20210204
     environment:
       WAIT_HOSTS: 172.28.1.1:9200, 172.28.1.4:5900
       WAIT_HOSTS_TIMEOUT: 120
@@ -110,9 +110,9 @@ services:
       fsnet:
         ipv4_address: 172.28.1.6
 
-  fskibana_20210121:
+  fskibana_20210204:
     image: docker.elastic.co/kibana/kibana:6.3.2
-    container_name: fskibana_20210121
+    container_name: fskibana_20210204
     environment:
       ELASTICSEARCH_URL: http://172.28.1.1:9200
     ports:

diff --git a/formshare/plugins/helpers.py b/formshare/plugins/helpers.py
@@ -78,7 +78,7 @@ def get_version():
     This returns the version of FormShare
     :return: The version of FormShare
     """
-    return "2.7.1 (20210121)"
+    return "2.7.2 (20210204)"
 
 
 @core_helper

diff --git a/install_steps.txt b/install_steps.txt
@@ -130,7 +130,7 @@ sudo python3 -m venv formshare_env
 # Grab the FormShare source code
 # ---------------------BEGIN OF IMPORTANT NOTE-------------------------
 # To use the stable version of FormShare do:
-sudo git clone https://github.com/qlands/FormShare.git -b stable-2.7.1 formshare
+sudo git clone https://github.com/qlands/FormShare.git -b stable-2.7.2 formshare
 # To use the development version of FormShare do:
 sudo git clone https://github.com/qlands/FormShare.git formshare
 # ---------------------END OF IMPORTANT NOTE-------------------------

diff --git a/setup.py b/setup.py
@@ -159,7 +159,7 @@
 
 setup(
     name="formshare",
-    version="2.7.1",
+    version="2.7.2",
     description="FormShare",
     long_description=README + "\n\n" + CHANGES,
     classifiers=[