From: Sylvain Desbureaux Date: Wed, 23 Jan 2019 10:14:30 +0000 (+0100) Subject: reduce sdnc-ansible-server image footprint X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4fe3b43a0d30a15ceed58c695d2a72c5382fded6;p=sdnc%2Foam.git reduce sdnc-ansible-server image footprint Project "CIA" scope is to provide smaller and multi architecture docker images. This proposition aims to do that for sdnc-ansible-server. The current size of this proposal is 139mb compared to the 618Mb image proposed before (and before actual ansible installation). Principles used are the following: 1. a "basic" `docker build .` should provide a working image; 2. use the smallest (and multi arch) base image possibe; 3. install necessary stuff only; 4. leverage python best practices for installation; 5. remove installation stuff occuring at run level and move them to build level. * Dockerfile is now at the root part; * ansible configuration file `ansible.cfg` is created and put in `configuration` folder; * ansible configuration file `ansible.cfg` is pushed during the build part with a reproductible process; * `python` files are on `ansible-server" folder so copying during build works out of the box; * yml files are put directly on `ansible-server/Playbooks` so copying during build works out the box; * Dockerfile base image is now alpine:3.8; * `timeout` executable being now from busybox, change in the command-line call has been made (`--signal` is now `-s` and `-t` is set before setting the timeout value). * Only install python and python-pip as alpine package and remove build dependencies package after use. * put all python requirements in `requirements.txt` package and launch pip installation command with this file. * call directly python main script (`RestServer.py`) as entrypoint and do the python installation stuff at build time. - [x] change pom.xml so building parts works - [ ] consider changing destination folder (`/opt/ansible-server/`) to the ancient one (`/opt/onap/ccsdk/`) if this is problematic Change-Id: I6295d7c2d1ed631e1842350581234686d704c1bf Issue-ID: INT-816 Signed-off-by: Sylvain Desbureaux --- diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index 991aa91f..3c22fd7a 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -62,7 +62,7 @@ 2.6 - copy-dockerfile + copy-files copy-resources @@ -71,29 +71,9 @@ ${basedir}/target/docker-stage - src/main/docker + src/main - Dockerfile - - true - - - - - - - copy-yml - - copy-resources - - validate - - ${basedir}/target/docker-stage/opt/onap/ccsdk/Playbooks - - - src/main/yml - - * + **/* false diff --git a/installation/ansible-server/src/main/.dockerignore b/installation/ansible-server/src/main/.dockerignore new file mode 100644 index 00000000..0d20b648 --- /dev/null +++ b/installation/ansible-server/src/main/.dockerignore @@ -0,0 +1 @@ +*.pyc diff --git a/installation/ansible-server/src/main/Dockerfile b/installation/ansible-server/src/main/Dockerfile new file mode 100644 index 00000000..726d6065 --- /dev/null +++ b/installation/ansible-server/src/main/Dockerfile @@ -0,0 +1,6 @@ +#FROM onap/ccsdk-ansible-server-image:${ccsdk.docker.version} +FROM onap/ccsdk-ansible-server-image:0.4-STAGING-latest + +LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)" + +COPY Playbooks /opt/ansible-server/Playbooks diff --git a/installation/ansible-server/src/main/yml/Ansible_inventory b/installation/ansible-server/src/main/Playbooks/Ansible_inventory similarity index 99% rename from installation/ansible-server/src/main/yml/Ansible_inventory rename to installation/ansible-server/src/main/Playbooks/Ansible_inventory index 69df84ff..4fffb37f 100644 --- a/installation/ansible-server/src/main/yml/Ansible_inventory +++ b/installation/ansible-server/src/main/Playbooks/Ansible_inventory @@ -17,11 +17,10 @@ # * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # * See the License for the specific language governing permissions and # * limitations under the License. -# * +# * # * ECOMP is a trademark and service mark of AT&T Intellectual Property. # * ============LICENSE_END========================================================= # */ [host] localhost ansible_connection=local - diff --git a/installation/ansible-server/src/main/yml/ansible_huawei_postcheck@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_postcheck@0.00.yml similarity index 100% rename from installation/ansible-server/src/main/yml/ansible_huawei_postcheck@0.00.yml rename to installation/ansible-server/src/main/Playbooks/ansible_huawei_postcheck@0.00.yml diff --git a/installation/ansible-server/src/main/yml/ansible_huawei_precheck@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_precheck@0.00.yml similarity index 100% rename from installation/ansible-server/src/main/yml/ansible_huawei_precheck@0.00.yml rename to installation/ansible-server/src/main/Playbooks/ansible_huawei_precheck@0.00.yml diff --git a/installation/ansible-server/src/main/yml/ansible_huawei_upgrade@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_upgrade@0.00.yml similarity index 100% rename from installation/ansible-server/src/main/yml/ansible_huawei_upgrade@0.00.yml rename to installation/ansible-server/src/main/Playbooks/ansible_huawei_upgrade@0.00.yml diff --git a/installation/ansible-server/src/main/yml/ansible_postcheck@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_postcheck@0.00.yml similarity index 100% rename from installation/ansible-server/src/main/yml/ansible_postcheck@0.00.yml rename to installation/ansible-server/src/main/Playbooks/ansible_postcheck@0.00.yml diff --git a/installation/ansible-server/src/main/yml/ansible_postcheck_jq@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_postcheck_jq@0.00.yml similarity index 100% rename from installation/ansible-server/src/main/yml/ansible_postcheck_jq@0.00.yml rename to installation/ansible-server/src/main/Playbooks/ansible_postcheck_jq@0.00.yml diff --git a/installation/ansible-server/src/main/yml/ansible_precheck@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_precheck@0.00.yml similarity index 100% rename from installation/ansible-server/src/main/yml/ansible_precheck@0.00.yml rename to installation/ansible-server/src/main/Playbooks/ansible_precheck@0.00.yml diff --git a/installation/ansible-server/src/main/yml/ansible_precheck_jq@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_precheck_jq@0.00.yml similarity index 100% rename from installation/ansible-server/src/main/yml/ansible_precheck_jq@0.00.yml rename to installation/ansible-server/src/main/Playbooks/ansible_precheck_jq@0.00.yml diff --git a/installation/ansible-server/src/main/yml/ansible_pyver@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_pyver@0.00.yml similarity index 100% rename from installation/ansible-server/src/main/yml/ansible_pyver@0.00.yml rename to installation/ansible-server/src/main/Playbooks/ansible_pyver@0.00.yml diff --git a/installation/ansible-server/src/main/yml/ansible_quiescetraffic@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_quiescetraffic@0.00.yml similarity index 100% rename from installation/ansible-server/src/main/yml/ansible_quiescetraffic@0.00.yml rename to installation/ansible-server/src/main/Playbooks/ansible_quiescetraffic@0.00.yml diff --git a/installation/ansible-server/src/main/yml/ansible_resumetraffic@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_resumetraffic@0.00.yml similarity index 100% rename from installation/ansible-server/src/main/yml/ansible_resumetraffic@0.00.yml rename to installation/ansible-server/src/main/Playbooks/ansible_resumetraffic@0.00.yml diff --git a/installation/ansible-server/src/main/yml/ansible_sleep@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_sleep@0.00.yml similarity index 98% rename from installation/ansible-server/src/main/yml/ansible_sleep@0.00.yml rename to installation/ansible-server/src/main/Playbooks/ansible_sleep@0.00.yml index aba2919e..345f5e49 100644 --- a/installation/ansible-server/src/main/yml/ansible_sleep@0.00.yml +++ b/installation/ansible-server/src/main/Playbooks/ansible_sleep@0.00.yml @@ -17,14 +17,14 @@ # * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # * See the License for the specific language governing permissions and # * limitations under the License. -# * +# * # * ECOMP is a trademark and service mark of AT&T Intellectual Property. # * ============LICENSE_END========================================================= # */ - hosts: all - # Mandatory: + # Mandatory: vars: sleep_time: "{{Sleep|default(10)}}" @@ -39,4 +39,3 @@ - debug: msg: "Done" - diff --git a/installation/ansible-server/src/main/yml/ansible_upgradesw@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_upgradesw@0.00.yml similarity index 100% rename from installation/ansible-server/src/main/yml/ansible_upgradesw@0.00.yml rename to installation/ansible-server/src/main/Playbooks/ansible_upgradesw@0.00.yml diff --git a/installation/ansible-server/src/main/yml/ansible_upgradesw_insjq@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_upgradesw_insjq@0.00.yml similarity index 100% rename from installation/ansible-server/src/main/yml/ansible_upgradesw_insjq@0.00.yml rename to installation/ansible-server/src/main/Playbooks/ansible_upgradesw_insjq@0.00.yml diff --git a/installation/ansible-server/src/main/yml/ansible_upgradesw_remjq@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_upgradesw_remjq@0.00.yml similarity index 100% rename from installation/ansible-server/src/main/yml/ansible_upgradesw_remjq@0.00.yml rename to installation/ansible-server/src/main/Playbooks/ansible_upgradesw_remjq@0.00.yml diff --git a/installation/ansible-server/src/main/yml/ansible_vfw_distributetraffic@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_vfw_distributetraffic@0.00.yml similarity index 100% rename from installation/ansible-server/src/main/yml/ansible_vfw_distributetraffic@0.00.yml rename to installation/ansible-server/src/main/Playbooks/ansible_vfw_distributetraffic@0.00.yml diff --git a/installation/ansible-server/src/main/docker/Dockerfile b/installation/ansible-server/src/main/docker/Dockerfile deleted file mode 100644 index 0e59fba8..00000000 --- a/installation/ansible-server/src/main/docker/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -# Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-ansible-server-image:${ccsdk.docker.version} - -LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)" - -#ENV http_proxy=http://anonymous:password@one.proxy.att.com:8080 -#ENV https_proxy=http://anonymous:password@one.proxy.att.com:8080 - -##Vim -RUN apt-get update -RUN apt-get -y install apt-file -RUN apt-file update -RUN apt-get -y install vim - -##Python: -RUN apt-get -y install python2.7 -RUN apt-get -y install python-pip - - - -# copy files needed -COPY opt /opt/ - -WORKDIR /opt/onap/ccsdk - -#ENTRYPOINT exec startAnsibleServer.sh -#CMD ["/bin/bash"] -EXPOSE 8000 -