From 409664bffe09ccca17f24d8294048edf30900337 Mon Sep 17 00:00:00 2001 From: "Farhaan Bukhsh(fhackdroid)" Date: Mon, 27 Feb 2017 12:34:11 +0530 Subject: [PATCH 1/5] Add vagrant support for ircb This commits add vagrant support for ircb, this is used to make development of ircb easy Signed-off-by: Farhaan Bukhsh(fhackdroid) --- Vagrantfile | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 Vagrantfile diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000..5ea40b5 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,105 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +# All Vagrant configuration is done below. The "2" in Vagrant.configure +# configures the configuration version (we support older styles for +# backwards compatibility). Please don't change it unless you know what +# you're doing. +Vagrant.configure("2") do |config| + # The most common configuration options are documented and commented below. + # For a complete reference, please see the online documentation at + # https://docs.vagrantup.com. + + # Every Vagrant development environment requires a box. You can search for + # boxes at https://atlas.hashicorp.com/search. + config.vm.box = "fedora/24-cloud-base" + + # Disable automatic box update checking. If you disable this, then + # boxes will only be checked for updates when the user runs + # `vagrant box outdated`. This is not recommended. + # config.vm.box_check_update = false + + # Create a forwarded port mapping which allows access to a specific port + # within the machine from a port on the host machine. In the example below, + # accessing "localhost:8080" will access port 80 on the guest machine. + # config.vm.network "forwarded_port", guest: 80, host: 8080 + + # Create a private network, which allows host-only access to the machine + # using a specific IP. + # config.vm.network "private_network", ip: "192.168.33.10" + if Vagrant.has_plugin?("vagrant-hostmanager") + config.hostmanager.enabled = true + config.hostmanager.manage_host = true + end + # Create a public network, which generally matched to bridged network. + # Bridged networks make the machine appear as another physical device on + # your network. + # config.vm.network "public_network" + + # Share an additional folder to the guest VM. The first argument is + # the path on the host to the actual folder. The second argument is + # the path on the guest to mount the folder. And the optional third + # argument is a set of non-required options. + # config.vm.synced_folder ".", "/vagrant", type:"rsync" + config.vm.synced_folder ".", "/vagrant", disable: true + config.vm.synced_folder ".", "/home/vagrant/devel", type: "rsync" + # If you want to turn on the sshfs uncomment the following line and comment + # the above mentioned line + # config.vm.synced_folder ".", "/home/vagrant/devel", type: "sshfs", sshfs_opts_append: "-o nonempty", reverse: true + # + # This config installs various system dependency for irc as required to run + # it + config.vm.provision "shell", inline: "sudo dnf -y install python3 python3-devel openssl openssl-devel redis" + config.vm.provision "shell", inline: "sudo pip3 install -r devel/requirements.txt" + config.vm.provision "shell", inline: "python3 setup.py develop" + config.vm.provision "shell", inline: "sudo systemctl start redis.service" + + # Provider-specific configuration so you can fine-tune various + # backing providers for Vagrant. These expose provider-specific options. + # Example for VirtualBox: + # + # config.vm.provider "virtualbox" do |vb| + # # Display the VirtualBox GUI when booting the machine + # vb.gui = true + # + # # Customize the amount of memory on the VM: + # vb.memory = "1024" + # end + # + # View the documentation for the provider you are using for more + # information on available options. + + # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies + # such as FTP and Heroku are also available. See the documentation at + # https://docs.vagrantup.com/v2/push/atlas.html for more information. + # config.push.define "atlas" do |push| + # push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME" + # end + + # Enable provisioning with a shell script. Additional provisioners such as + # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the + # documentation for more information about their specific syntax and use. + # config.vm.provision "shell", inline: <<-SHELL + # apt-get update + # apt-get install -y apache2 + # SHELL +config.vm.define "ircb" do |ircb| + ircb.vm.host_name = "ircb-dev.example.com" + + ircb.vm.provider :libvirt do |domain| + # Season to taste + domain.cpus = 4 + domain.graphics_type = "spice" + domain.memory = 2048 + domain.video_type = "qxl" + + # Uncomment the following line if you would like to enable libvirt's unsafe cache + # mode. It is called unsafe for a reason, as it causes the virtual host to ignore all + # fsync() calls from the guest. Only do this if you are comfortable with the possibility of + # your development guest becoming corrupted (in which case you should only need to do a + # vagrant destroy and vagrant up to get a new one). + # + # domain.volume_cache = "unsafe" + end + end +end From 315abee6e30a0a1f00b67d9ad4d0e1df64f42697 Mon Sep 17 00:00:00 2001 From: "Farhaan Bukhsh(fhackdroid)" Date: Fri, 3 Mar 2017 22:36:49 +0530 Subject: [PATCH 2/5] Improved Vagrantfile and added ansible provision This commit adds Vagrantfile and ansible to add provision to Vagrant image Signed-off-by: Farhaan Bukhsh(fhackdroid) --- Vagrantfile | 15 ++++++---- ansible/roles/ircb-dev/handlers/main.yml | 2 ++ ansible/roles/ircb-dev/tasks/main.yml | 35 ++++++++++++++++++++++++ ansible/vagrant-playbook.yml | 7 +++++ requirements.txt | 1 + 5 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 ansible/roles/ircb-dev/handlers/main.yml create mode 100644 ansible/roles/ircb-dev/tasks/main.yml create mode 100644 ansible/vagrant-playbook.yml diff --git a/Vagrantfile b/Vagrantfile index 5ea40b5..7be1c9c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -23,6 +23,7 @@ Vagrant.configure("2") do |config| # within the machine from a port on the host machine. In the example below, # accessing "localhost:8080" will access port 80 on the guest machine. # config.vm.network "forwarded_port", guest: 80, host: 8080 + config.vm.network "forwarded_port", guest: 9000, host: 9000 # Create a private network, which allows host-only access to the machine # using a specific IP. @@ -47,13 +48,15 @@ Vagrant.configure("2") do |config| # the above mentioned line # config.vm.synced_folder ".", "/home/vagrant/devel", type: "sshfs", sshfs_opts_append: "-o nonempty", reverse: true # - # This config installs various system dependency for irc as required to run - # it - config.vm.provision "shell", inline: "sudo dnf -y install python3 python3-devel openssl openssl-devel redis" - config.vm.provision "shell", inline: "sudo pip3 install -r devel/requirements.txt" - config.vm.provision "shell", inline: "python3 setup.py develop" + # Comment this line if you would like to disable the automatic update during provisioning + config.vm.provision "shell", inline: "sudo dnf upgrade -y" + # bootstrap and run with ansible + config.vm.provision "shell", inline: "sudo dnf -y install python2-dnf libselinux-python" + config.vm.provision "ansible" do |ansible| + ansible.playbook = "ansible/vagrant-playbook.yml" + end + config.vm.provision "shell", inline: "cd /home/vagrant/devel && sudo python3 setup.py develop" config.vm.provision "shell", inline: "sudo systemctl start redis.service" - # Provider-specific configuration so you can fine-tune various # backing providers for Vagrant. These expose provider-specific options. # Example for VirtualBox: diff --git a/ansible/roles/ircb-dev/handlers/main.yml b/ansible/roles/ircb-dev/handlers/main.yml new file mode 100644 index 0000000..1203121 --- /dev/null +++ b/ansible/roles/ircb-dev/handlers/main.yml @@ -0,0 +1,2 @@ +- name: restart redis + service: name=redis state=restarted diff --git a/ansible/roles/ircb-dev/tasks/main.yml b/ansible/roles/ircb-dev/tasks/main.yml new file mode 100644 index 0000000..bdc17ad --- /dev/null +++ b/ansible/roles/ircb-dev/tasks/main.yml @@ -0,0 +1,35 @@ +--- +- name: Install helpfull packages + dnf: name={{ item }} state=present + with_items: + - git + - python-rpdb + - tmux + - tree + - vim-enhanced + +- name: Install ircb development packages + dnf: name={{ item }} state=present + with_items: + - gcc + - libffi-devel + - python-alembic + - redis + - python3-devel + - openssl-devel + - python-pip + - python-virtualenvwrapper + - python-devel + - libffi + - python + - zeromq + - zeromq-devel + - redhat-rpm-config + +- name: Install python packages for ircb + pip: requirements=/home/vagrant/devel/requirements.txt executable=pip3.5 + +- name: Run python3 setup + shell: python3 setup.py develop + args: + chdir: /home/vagrant/devel diff --git a/ansible/vagrant-playbook.yml b/ansible/vagrant-playbook.yml new file mode 100644 index 0000000..e9a7eaa --- /dev/null +++ b/ansible/vagrant-playbook.yml @@ -0,0 +1,7 @@ +--- +- hosts: all + become: true + become_method: sudo + vars: + roles: + - ircb-dev diff --git a/requirements.txt b/requirements.txt index b7f63b6..aad89ee 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,3 +15,4 @@ aiohttp-session[secure]==0.5.0 aiozmq==0.7.1 msgpack-python==0.4.7 PyYAML==3.11 +redis From 1ec5a810a7a06a46b749b3465be9d457e5826809 Mon Sep 17 00:00:00 2001 From: "Farhaan Bukhsh(fhackdroid)" Date: Sat, 4 Mar 2017 12:41:37 +0530 Subject: [PATCH 3/5] Add port to interact with the api Signed-off-by: Farhaan Bukhsh(fhackdroid) --- Vagrantfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Vagrantfile b/Vagrantfile index 7be1c9c..1414a1a 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -24,6 +24,7 @@ Vagrant.configure("2") do |config| # accessing "localhost:8080" will access port 80 on the guest machine. # config.vm.network "forwarded_port", guest: 80, host: 8080 config.vm.network "forwarded_port", guest: 9000, host: 9000 + config.vm.network "forwarded_port", guest: 10000, host: 10000 # Create a private network, which allows host-only access to the machine # using a specific IP. From 8927395beba533202bdf48a97e4a78f6fb36a9b7 Mon Sep 17 00:00:00 2001 From: "Farhaan Bukhsh(fhackdroid)" Date: Sun, 5 Mar 2017 08:39:24 +0530 Subject: [PATCH 4/5] Move starting service and running setup to ansible Signed-off-by: Farhaan Bukhsh(fhackdroid) --- Vagrantfile | 2 -- ansible/roles/ircb-dev/tasks/main.yml | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 1414a1a..0513c52 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -56,8 +56,6 @@ Vagrant.configure("2") do |config| config.vm.provision "ansible" do |ansible| ansible.playbook = "ansible/vagrant-playbook.yml" end - config.vm.provision "shell", inline: "cd /home/vagrant/devel && sudo python3 setup.py develop" - config.vm.provision "shell", inline: "sudo systemctl start redis.service" # Provider-specific configuration so you can fine-tune various # backing providers for Vagrant. These expose provider-specific options. # Example for VirtualBox: diff --git a/ansible/roles/ircb-dev/tasks/main.yml b/ansible/roles/ircb-dev/tasks/main.yml index bdc17ad..64ce56c 100644 --- a/ansible/roles/ircb-dev/tasks/main.yml +++ b/ansible/roles/ircb-dev/tasks/main.yml @@ -33,3 +33,6 @@ shell: python3 setup.py develop args: chdir: /home/vagrant/devel + +- name: Start redis service + service: name=redis state=started enabled=yes From 4b0c6566ed934f10d897b6ef6cdd765a380d9f9f Mon Sep 17 00:00:00 2001 From: "Farhaan Bukhsh(fhackdroid)" Date: Thu, 9 Mar 2017 21:59:00 +0530 Subject: [PATCH 5/5] Add dockerfile and read me of how to use it Signed-off-by: Farhaan Bukhsh(fhackdroid) --- Dockerfile/Dockerfile | 27 +++++++++++++++++++++++++++ Dockerfile/README | 15 +++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 Dockerfile/Dockerfile create mode 100644 Dockerfile/README diff --git a/Dockerfile/Dockerfile b/Dockerfile/Dockerfile new file mode 100644 index 0000000..fbe0f78 --- /dev/null +++ b/Dockerfile/Dockerfile @@ -0,0 +1,27 @@ +# Pagure +# Build using: sudo docker build -t "ircb:0.0.1" --rm=true --no-cache . +# +# NAME pagure +# VERSION 0.0.1 +# LAST_UPDATED 2017-03-06 14:47 + +FROM fedora/redis:latest +MAINTAINER Farhaan Bukhsh + +RUN dnf -y update && dnf clean all +RUN dnf install -y make automake gcc gcc-c++ kernel-devel libffi libffi-devel \ + zeromq zeromq-devel redhat-rpm-config +RUN dnf install -y python2-devel python-setuptools python-nose py-bcrypt python-alembic \ + python-pip python3-devel openssl-devel redis python3-pip + +RUN pip3.4 install Flask==0.10.1 Flask-SQLAlchemy==2.0 Flask-User==0.6.11 \ + SQLAlchemy==1.0.13 SQLAlchemy-Utils==0.30.15 irc3==0.9.3 \ + alembic==0.8.3 WTForms-Alchemy==0.15.0 click==6.3 \ + aioredis==0.2.4 tabulate==0.7.5 aiohttp==1.2.0 \ + aiohttp-auth==0.1.1 aiohttp-session[secure]==0.5.0 \ + aiozmq==0.7.1 msgpack-python==0.4.7 PyYAML==3.11 redis + +EXPOSE 9000 10000 6379 + +CMD ["redis-service"] + diff --git a/Dockerfile/README b/Dockerfile/README new file mode 100644 index 0000000..27c0638 --- /dev/null +++ b/Dockerfile/README @@ -0,0 +1,15 @@ +How to configure +================ + +- Build the docker image + +- Run the command + docker run --rm --name "ircb" -it -p 9000:9000 \ + -p 10000:10000 -p 6739:6739 -v /path/to/ircb:/ircb ircb:0.0.1 \ + bash + +- cd ircb + +- pyhton3 setup.py develop + +Note: Replace path to irc with the absolute path to ircb repo