增加docker环境基础安装test-docker-env-install

8 files changed, 96 insertions, 14 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8c764d..9370f2f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ stages:
   tags:
   - share
     
-rpm_build:
+file_build:
   stage: build
   variables:
     VER_NAME: $CI_COMMIT_REF_NAME
diff --git a/build_config/group_vars/local.yml b/build_config/group_vars/local.yml
index 5b261d4..6be1118 100644
--- a/build_config/group_vars/local.yml
+++ b/build_config/group_vars/local.yml
@@ -4,3 +4,7 @@ tarpath:
     - /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/deploy.yml
     - /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/tsg-diagnose
   destdict: /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/build/
+
+tsgDiagnoseDockerFile: 
+  unarchiveUrl: https://repo.internal.geedge.net/pulp/content/install/stable/package/docker-rpm-test-docker-ce-7.tar.gz
+  unarchiveDest: /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/tsg-diagnose/files
diff --git a/customize.yml b/customize.yml
index f94d8fd..3a4de72 100644
--- a/customize.yml
+++ b/customize.yml
@@ -2,4 +2,51 @@ rpmdict:
   tsgDiagnose:
     fullname: "tsg-diagnose-test_edit_name-1.el7.x86_64.rpm"
     name: "tsg-diagnose"
-    downpath: "/tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/tsg-diagnose/files/rpms"
\ No newline at end of file
+    downpath: "/tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/tsg-diagnose/files/rpms"
+
+dockerEnvRpm:
+  dockerCe:
+    - container-selinux-2.119.2-1.911c772.el7_8.noarch.rpm
+    - selinux-policy-targeted-3.13.1-266.el7_8.1.noarch.rpm
+    - selinux-policy-3.13.1-266.el7_8.1.noarch.rpm
+    - containerd.io-1.2.13-3.2.el7.x86_64.rpm
+    - policycoreutils-python-2.5-34.el7.x86_64.rpm
+    - policycoreutils-2.5-34.el7.x86_64.rpm
+    - libselinux-utils-2.5-15.el7.x86_64.rpm
+    - libselinux-python-2.5-15.el7.x86_64.rpm
+    - libseccomp-2.3.1-4.el7.x86_64.rpm
+    - iptables-1.4.21-34.el7.x86_64.rpm
+    - libcgroup-0.41-21.el7.x86_64.rpm
+    - audit-libs-python-2.8.5-4.el7.x86_64.rpm
+    - setools-libs-3.3.8-4.el7.x86_64.rpm
+    - libsemanage-python-2.5-14.el7.x86_64.rpm
+    - checkpolicy-2.5-8.el7.x86_64.rpm
+    - libnetfilter_conntrack-1.0.6-1.el7_3.x86_64.rpm
+    - python-IPy-0.75-6.el7.noarch.rpm
+    - libnfnetlink-1.0.1-4.el7.x86_64.rpm
+    - libmnl-1.0.3-7.el7.x86_64.rpm
+    - docker-ce-cli-19.03.12-3.el7.x86_64.rpm
+    - docker-ce-19.03.12-3.el7.x86_64.rpm
+  dockerCompose:
+    - libtirpc-0.2.4-0.16.el7.x86_64.rpm
+    - libyaml-0.1.4-11.el7_0.x86_64.rpm
+    - python3-3.6.8-13.el7.x86_64.rpm
+    - python36-cached_property-1.5.1-2.el7.noarch.rpm
+    - python36-chardet-3.0.4-1.el7.noarch.rpm
+    - python36-docker-2.6.1-3.el7.noarch.rpm
+    - python36-dockerpty-0.4.1-18.el7.noarch.rpm
+    - python36-docker-pycreds-0.2.1-2.el7.noarch.rpm
+    - python36-docopt-0.6.2-8.el7.noarch.rpm
+    - python36-idna-2.7-2.el7.noarch.rpm
+    - python36-jsonschema-2.5.1-4.el7.noarch.rpm
+    - python36-pysocks-1.6.8-7.el7.noarch.rpm
+    - python36-PyYAML-3.13-1.el7.x86_64.rpm
+    - python36-requests-2.14.2-2.el7.noarch.rpm
+    - python36-six-1.14.0-2.el7.noarch.rpm
+    - python36-texttable-1.6.2-1.el7.noarch.rpm
+    - python36-urllib3-1.25.6-1.el7.noarch.rpm
+    - python36-websocket-client-0.47.0-2.el7.noarch.rpm
+    - python3-libs-3.6.8-13.el7.x86_64.rpm
+    - python3-pip-9.0.3-7.el7_7.noarch.rpm
+    - python3-setuptools-39.2.0-10.el7.noarch.rpm
+    - docker-compose-1.18.0-4.el7.noarch.rpm
\ No newline at end of file
diff --git a/roles/package-build/tasks/DockerEnvDownload.yml b/roles/package-build/tasks/DockerEnvDownload.yml
new file mode 100644
index 0000000..b793992
--- /dev/null
+++ b/roles/package-build/tasks/DockerEnvDownload.yml
@@ -0,0 +1,6 @@
+---
+- name: 'Unarchive docker env rpm file from remote host'
+  unarchive:
+    src: "{{ tsgDiagnoseDockerFile.unarchiveUrl }}"
+    dest: "{{ tsgDiagnoseDockerFile.unarchiveDest }}"
+    remote_src: yes
\ No newline at end of file
diff --git a/roles/package-build/tasks/main.yml b/roles/package-build/tasks/main.yml
index d53b760..58e931e 100644
--- a/roles/package-build/tasks/main.yml
+++ b/roles/package-build/tasks/main.yml
@@ -1,3 +1,4 @@
 ---
+- include: DockerEnvDownload.yml
 - include: RpmDownload.yml
 - include: TarBuild.yml 
diff --git a/roles/tsg-diagnose/tasks/DockerEnv.yml b/roles/tsg-diagnose/tasks/DockerEnv.yml
new file mode 100644
index 0000000..df261ae
--- /dev/null
+++ b/roles/tsg-diagnose/tasks/DockerEnv.yml
@@ -0,0 +1,19 @@
+--- 
+- name: "Install docker-ce"
+  yum:
+    name: "/tmp/ansible_deploy/tsg-diagnose/rpms/rpm-docker/docker-ce/{{ item }}"
+    state: present
+    with_items: "{{ dockerEnvRpm.dockerCe }}"
+
+- name: "Install docker-compose"
+  yum:
+    name: "/tmp/ansible_deploy/tsg-diagnose/rpms/rpm-docker/docker-compose/{{ item }}"
+    state: present
+    with_items: "{{ dockerEnvRpm.dockerCompose }}"
+
+- name: 'Docker service start'
+  systemd:
+    name: docker
+    enabled: yes
+    daemon_reload: yes
+
diff --git a/roles/tsg-diagnose/tasks/TsgDiagnose.yml b/roles/tsg-diagnose/tasks/TsgDiagnose.yml
new file mode 100644
index 0000000..b8519f6
--- /dev/null
+++ b/roles/tsg-diagnose/tasks/TsgDiagnose.yml
@@ -0,0 +1,12 @@
+--- 
+- name: "Install tsg-diagnose rpm package"
+  yum:
+    name:
+      - "/tmp/ansible_deploy/tsg-diagnose/rpms/{{rpmdict.tsgDiagnose.fullname}}"
+    state: present
+    
+- name: 'Tsg-diagnose service start'
+  systemd:
+    name: tsg-diagnose
+    enabled: yes
+    daemon_reload: yes
\ No newline at end of file
diff --git a/roles/tsg-diagnose/tasks/main.yml b/roles/tsg-diagnose/tasks/main.yml
index 980196b..64c4448 100644
--- a/roles/tsg-diagnose/tasks/main.yml
+++ b/roles/tsg-diagnose/tasks/main.yml
@@ -1,21 +1,14 @@
 --- 
-- name: 'copy file to device'
+- name: 'Copy tsg-diagnose file to device'
   copy: 
     src: "{{item.src}}"
     dest: "{{item.dest}}"
     mode: "{{item.mode}}"
   with_items:
     - { src: "{{ role_path }}/files/", dest: "/tmp/ansible_deploy/tsg-diagnose", mode: '0755' }
-
-- name: "install kni rpms from localhost"
-  yum:
-    name:
-      - "/tmp/ansible_deploy/tsg-diagnose/rpms/{{rpmdict.tsgDiagnose.fullname}}"
-    state: present
     
-- name: 'tsg-diagnose service start and docker-compose up'
-  systemd:
-    name: tsg-diagnose
-    enabled: yes
-    daemon_reload: yes
+- name: 'Install docker env rpm'
+  include: DockerEnv.yml
 
+- name: 'Install Tsg-diagnose'
+  include: TsgDiagnose.yml
\ No newline at end of file