From ee42f68687288f5cbc3036059c508cf4ba57ac2e Mon Sep 17 00:00:00 2001 From: Carlos Quiros Date: Sat, 30 May 2020 15:01:01 -0600 Subject: [PATCH] Bump version to 2.6.3 --- README.md | 18 +++++------ docker_compose/docker-compose.yml | 22 +++++++------- docker_compose_with_apache/docker-compose.yml | 26 ++++++++-------- .../docker-compose.yml | 30 +++++++++---------- docker_files/formshare/stable.Dockerfile | 2 +- formshare/plugins/helpers.py | 2 +- install_steps.txt | 2 +- 7 files changed, 51 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 92bd7eba..ee14b27c 100644 --- a/README.md +++ b/README.md @@ -25,11 +25,11 @@ ScreenShot Releases ------------ -The current stable release is 2.6.2 and it is available [here](https://github.com/qlands/FormShare/tree/stable-2.6.2) +The current stable release is 2.6.3 and it is available [here](https://github.com/qlands/FormShare/tree/stable-2.6.3) -The database signature for stable 2.6.2 is be94ab1faa43 +The database signature for stable 2.6.3 is be94ab1faa43 -The Docker image for stable 2.6.2 is 20200515 +The Docker image for stable 2.6.3 is 20200530 Installation ------------ @@ -49,11 +49,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.6.2 formshare_source +sudo git clone https://github.com/qlands/FormShare.git -b stable-2.6.3 formshare_source # Copy the docker compose file from the source to a new directory -sudo mkdir formshare_docker_compose_20200515 -sudo cp ./formshare_source/docker_compose/docker-compose.yml ./formshare_docker_compose_20200515/ +sudo mkdir formshare_docker_compose_20200530 +sudo cp ./formshare_source/docker_compose/docker-compose.yml ./formshare_docker_compose_20200530/ # Make the directory structure for FormShare sudo mkdir /opt/formshare @@ -75,11 +75,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_20200515 +cd /opt/formshare_docker_compose_20200530 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_20200515/docker-compose.yml +sudo nano /opt/formshare_docker_compose_20200530/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 @@ -122,7 +122,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_20200515 +cd /opt/formshare_docker_compose_20200530 sudo docker-compose up -d # Browse to FormShare diff --git a/docker_compose/docker-compose.yml b/docker_compose/docker-compose.yml index 1d35767d..4e40ffb2 100644 --- a/docker_compose/docker-compose.yml +++ b/docker_compose/docker-compose.yml @@ -1,8 +1,8 @@ version: '3' services: - fsmysql_20200515: + fsmysql_20200530: image: mysql:5.7.27 - container_name: fs_mysql_20200515 + container_name: fs_mysql_20200530 environment: MYSQL_ROOT_PASSWORD: my_secure_password volumes: @@ -11,9 +11,9 @@ services: fsnet: ipv4_address: 172.28.1.5 - fselasticsearch_20200515: + fselasticsearch_20200530: image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2 - container_name: fs_elasticsearch_20200515 + container_name: fs_elasticsearch_20200530 environment: - cluster.name=docker-cluster - bootstrap.memory_lock=true @@ -28,9 +28,9 @@ services: networks: fsnet: ipv4_address: 172.28.1.1 - fselasticsearch2_20200515: + fselasticsearch2_20200530: image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2 - container_name: fs_elasticsearch2_20200515 + container_name: fs_elasticsearch2_20200530 environment: - cluster.name=docker-cluster - bootstrap.memory_lock=true @@ -46,9 +46,9 @@ services: networks: fsnet: ipv4_address: 172.28.1.2 - fselasticsearch3_20200515: + fselasticsearch3_20200530: image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2 - container_name: fs_elasticsearch3_20200515 + container_name: fs_elasticsearch3_20200530 environment: - cluster.name=docker-cluster - bootstrap.memory_lock=true @@ -65,9 +65,9 @@ services: fsnet: ipv4_address: 172.28.1.3 - formshare_20200515: - image: qlands/formshare2:20200515 - container_name: formshare_20200515 + formshare_20200530: + image: qlands/formshare2:20200530 + container_name: formshare_20200530 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 index 2a340723..1db08796 100644 --- a/docker_compose_with_apache/docker-compose.yml +++ b/docker_compose_with_apache/docker-compose.yml @@ -1,8 +1,8 @@ version: '3' services: - fsmysql_20200515: + fsmysql_20200530: image: mysql:5.7.27 - container_name: fs_mysql_20200515 + container_name: fs_mysql_20200530 environment: MYSQL_ROOT_PASSWORD: my_secure_password volumes: @@ -11,9 +11,9 @@ services: fsnet: ipv4_address: 172.28.1.5 - fselasticsearch_20200515: + fselasticsearch_20200530: image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2 - container_name: fs_elasticsearch_20200515 + container_name: fs_elasticsearch_20200530 environment: - cluster.name=docker-cluster - bootstrap.memory_lock=true @@ -28,9 +28,9 @@ services: networks: fsnet: ipv4_address: 172.28.1.1 - fselasticsearch2_20200515: + fselasticsearch2_20200530: image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2 - container_name: fs_elasticsearch2_20200515 + container_name: fs_elasticsearch2_20200530 environment: - cluster.name=docker-cluster - bootstrap.memory_lock=true @@ -46,9 +46,9 @@ services: networks: fsnet: ipv4_address: 172.28.1.2 - fselasticsearch3_20200515: + fselasticsearch3_20200530: image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2 - container_name: fs_elasticsearch3_20200515 + container_name: fs_elasticsearch3_20200530 environment: - cluster.name=docker-cluster - bootstrap.memory_lock=true @@ -64,9 +64,9 @@ services: networks: fsnet: ipv4_address: 172.28.1.3 - formshare_20200515: - image: qlands/formshare2:20200515 - container_name: formshare_20200515 + formshare_20200530: + image: qlands/formshare2:20200530 + container_name: formshare_20200530 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_20200515: + fsapache_20200530: image: qlands/httpd:2.4 - container_name: fsapache_20200515 + container_name: fsapache_20200530 ports: - 80:80 networks: diff --git a/docker_compose_with_fluentd/docker-compose.yml b/docker_compose_with_fluentd/docker-compose.yml index d90951d7..f9b3e977 100644 --- a/docker_compose_with_fluentd/docker-compose.yml +++ b/docker_compose_with_fluentd/docker-compose.yml @@ -1,8 +1,8 @@ version: '3' services: - fsmysql_20200515: + fsmysql_20200530: image: mysql:5.7.27 - container_name: fs_mysql_20200515 + container_name: fs_mysql_20200530 environment: MYSQL_ROOT_PASSWORD: my_secure_password volumes: @@ -11,9 +11,9 @@ services: fsnet: ipv4_address: 172.28.1.5 - fselasticsearch_20200515: + fselasticsearch_20200530: image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2 - container_name: fs_elasticsearch_20200515 + container_name: fs_elasticsearch_20200530 environment: - cluster.name=docker-cluster - bootstrap.memory_lock=true @@ -28,9 +28,9 @@ services: networks: fsnet: ipv4_address: 172.28.1.1 - fselasticsearch2_20200515: + fselasticsearch2_20200530: image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2 - container_name: fs_elasticsearch2_20200515 + container_name: fs_elasticsearch2_20200530 environment: - cluster.name=docker-cluster - bootstrap.memory_lock=true @@ -46,9 +46,9 @@ services: networks: fsnet: ipv4_address: 172.28.1.2 - fselasticsearch_202005153: + fselasticsearch_202005303: image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2 - container_name: fs_elasticsearch3_20200515 + container_name: fs_elasticsearch3_20200530 environment: - cluster.name=docker-cluster - bootstrap.memory_lock=true @@ -64,9 +64,9 @@ services: networks: fsnet: ipv4_address: 172.28.1.3 - formshare_20200515: - image: qlands/formshare2:20200515 - container_name: formshare_20200515 + formshare_20200530: + image: qlands/formshare2:20200530 + container_name: formshare_20200530 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_20200515: + fsfluentd_20200530: image: qlands/fluentd:v1.7.3-1.0 - container_name: fsfluentd_20200515 + container_name: fsfluentd_20200530 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_20200515: + fskibana_20200530: image: docker.elastic.co/kibana/kibana:6.3.2 - container_name: fskibana_20200515 + container_name: fskibana_20200530 environment: ELASTICSEARCH_URL: http://172.28.1.1:9200 ports: diff --git a/docker_files/formshare/stable.Dockerfile b/docker_files/formshare/stable.Dockerfile index e6a5d643..4f72be67 100644 --- a/docker_files/formshare/stable.Dockerfile +++ b/docker_files/formshare/stable.Dockerfile @@ -87,7 +87,7 @@ VOLUME /opt/formshare_odata RUN mkdir formshare_gunicorn RUN python3 -m venv formshare_env -RUN git clone https://github.com/qlands/FormShare.git -b stable-2.6.2 formshare +RUN git clone https://github.com/qlands/FormShare.git -b stable-2.6.3 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 diff --git a/formshare/plugins/helpers.py b/formshare/plugins/helpers.py index e8d0b853..7a2a99ca 100644 --- 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.6.2 (20200515)" + return "2.6.3 (20200530)" @core_helper diff --git a/install_steps.txt b/install_steps.txt index a74d0d79..fc84323b 100644 --- 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.6.2 formshare +sudo git clone https://github.com/qlands/FormShare.git -b stable-2.6.3 formshare # To use the development version of FormShare do: sudo git clone https://github.com/qlands/FormShare.git formshare # ---------------------END OF IMPORTANT NOTE-------------------------