Merge pull request #238 from wazuh/feature-235-dockerfile-improvement

Improvements for Jenkins build's dockerfile
wazuh · Nov 6, 2019 · 8b90394 · 8b90394
2 parents c4a2f03 + 62af888
commit 8b90394
Show file tree

Hide file tree

Showing 10 changed files with 139 additions and 0 deletions.
diff --git a/.github/ISSUE_TEMPLATE/test--mitre.md b/.github/ISSUE_TEMPLATE/test--mitre.md
@@ -1,3 +1,7 @@
+| Name | About | Title | Labels | Assigness |
+| --- | --- | --- | --- | --- | 
+| Test: Mitre | Test suite for Mitre | '' | '' | '' |
+
 # Mitre
 
 | Version | Revision | 

diff --git a/ansible/wazuh-ansible/molecule/default/molecule.yml b/ansible/wazuh-ansible/molecule/default/molecule.yml
@@ -14,6 +14,11 @@ platforms:
       - nofile:262144:262144
     privileged: true
     memory_reservation: 2048m
+    tmpfs:
+      - /run
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
 provisioner:
   name: ansible
   config_options:

diff --git a/ansible/wazuh-ansible/molecule/elasticsearch-xpack/molecule.yml b/ansible/wazuh-ansible/molecule/elasticsearch-xpack/molecule.yml
@@ -16,13 +16,23 @@ platforms:
       - nofile:262144:262144
     privileged: true
     memory_reservation: 2048m
+    tmpfs:
+      - /run
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: elasticsearch_${MOL_PLATFORM:-centos7}-2
     image: ${MOL_IMAGE:-milcom/centos7-systemd}
     command: /sbin/init
     ulimits:
       - nofile:262144:262144
     privileged: true
     memory_reservation: 2048m
+    tmpfs:
+      - /run
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
 provisioner:
   name: ansible
   config_options:

diff --git a/ansible/wazuh-ansible/molecule/elasticsearch/molecule.yml b/ansible/wazuh-ansible/molecule/elasticsearch/molecule.yml
@@ -16,6 +16,11 @@ platforms:
       - nofile:262144:262144
     privileged: true
     memory_reservation: 2048m
+    tmpfs:
+      - /run
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
 provisioner:
   name: ansible
   config_options:

diff --git a/ansible/wazuh-ansible/molecule/kibana/molecule.yml b/ansible/wazuh-ansible/molecule/kibana/molecule.yml
@@ -16,6 +16,11 @@ platforms:
       - nofile:262144:262144
     privileged: true
     memory_reservation: 1024m
+    tmpfs:
+      - /run
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
 provisioner:
   name: ansible
   config_options:

diff --git a/ansible/wazuh-ansible/molecule/wazuh-agent/molecule.yml b/ansible/wazuh-ansible/molecule/wazuh-agent/molecule.yml
@@ -24,6 +24,11 @@ platforms:
       - name: wazuh
     groups:
       - agent
+    tmpfs:
+      - /run
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
   #- name: wazuh_agent_xenial
   #  image: solita/ubuntu-systemd:xenial
   #  privileged: true

diff --git a/ansible/wazuh-ansible/molecule/worker/molecule.yml b/ansible/wazuh-ansible/molecule/worker/molecule.yml
@@ -16,6 +16,11 @@ platforms:
       - nofile:262144:262144
     privileged: true
     memory_reservation: 2048m
+    tmpfs:
+      - /run
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
 provisioner:
   name: ansible
   config_options:

diff --git a/kitchen/wazuh-chef/manager/files/1-build-model/Dockerfile b/kitchen/wazuh-chef/manager/files/1-build-model/Dockerfile
@@ -0,0 +1,26 @@
+FROM ruby
+
+RUN apt-get update && apt install docker.io git curl wget -y
+
+RUN apt-get update
+
+RUN gem install kitchen-docker && \
+    gem install rbnacl && \
+    gem install rbnacl-libsodium && \
+    gem install bcrypt_pbkdf && \
+    gem install berkshelf && \
+    gem install httpclient
+
+RUN cd $HOME && \
+    git clone https://github.com/wazuh/wazuh-qa.git && \
+    cd $HOME/wazuh-qa && \
+    git checkout devel && \
+    cd $HOME/wazuh-qa/kitchen/wazuh-chef/manager/files/ && \
+    bundle install
+
+RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python get-pip.py
+
+RUN pip install pytest && pip install testinfra && pip install paramiko
+
+# Standard SSH port
+EXPOSE 22
diff --git a/kitchen/wazuh-chef/manager/files/entrypoint/Dockerfile b/kitchen/wazuh-chef/manager/files/entrypoint/Dockerfile
@@ -0,0 +1,35 @@
+FROM ruby
+
+CMD tail -f /dev/null
+
+COPY entrypoint.sh /usr/local/bin/
+
+RUN chmod 777 /usr/local/bin/entrypoint.sh \
+    && ln -s /usr/local/bin/entrypoint.sh /
+
+ENTRYPOINT ["entrypoint.sh"]
+
+RUN apt-get update && apt install docker.io git curl wget -y
+
+RUN apt-get update
+
+RUN gem install kitchen-docker && \
+    gem install rbnacl && \
+    gem install rbnacl-libsodium && \
+    gem install bcrypt_pbkdf && \
+    gem install berkshelf && \
+    gem install httpclient
+
+RUN cd $HOME && \
+    git clone https://github.com/wazuh/wazuh-qa.git && \
+    cd $HOME/wazuh-qa && \
+    git checkout devel && \
+    cd $HOME/wazuh-qa/kitchen/wazuh-chef/manager/files/ && \
+    bundle install
+
+RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python get-pip.py
+
+RUN pip install pytest && pip install testinfra && pip install paramiko
+
+# Standard SSH port
+EXPOSE 22
diff --git a/kitchen/wazuh-chef/manager/files/entrypoint/entrypoint.sh b/kitchen/wazuh-chef/manager/files/entrypoint/entrypoint.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+set -e
+
+CHEF_SOURCE_BRANCH=$1
+CHEF_TARGET_BRANCH=$2
+QA_BRANCH=$3
+
+
+cd $HOME/wazuh-qa/ && \
+        git pull --all && \
+        git checkout $QA_BRANCH && \
+        git pull
+
+cd $HOME && \
+        git clone https://github.com/wazuh/wazuh-chef.git && \
+        cd $HOME/wazuh-chef/ && \
+        git checkout $CHEF_SOURCE_BRANCH && \
+        git pull && \
+        git checkout $CHEF_TARGET_BRANCH && \
+        git pull && \
+        git checkout $CHEF_SOURCE_BRANCH && \
+        git merge $CHEF_SOURCE_BRANCH
+
+cp -rf $HOME/wazuh-qa/kitchen/wazuh-chef/manager/files/* $HOME/wazuh-chef/cookbooks/wazuh_manager/
+cp -rf $HOME/wazuh-qa/kitchen/wazuh-chef/manager/test/* $HOME/wazuh-chef/cookbooks/wazuh_manager/test/
+cp -rf $HOME/wazuh-qa/kitchen/wazuh-chef/manager/test_environment/* $HOME/wazuh-chef/cookbooks/wazuh_manager/test/environments/
+cp -rf $HOME/wazuh-qa/kitchen/wazuh-chef/agent/* $HOME/wazuh-chef/cookbooks/wazuh_agent/test/environments/
+
+
+cd $HOME/wazuh-chef/cookbooks/wazuh_manager/ && \
+        mkdir .kitchen
+
+cd $HOME/wazuh-chef/cookbooks/wazuh_manager/ && \
+        ls -ltrh
+        chmod +x run.sh && \
+        chmod +x clean.sh && \
+        rm .kitchen.yml
+
+tail -f /dev/null