diff options
Diffstat (limited to 'docker/vpp/vpp-centos8')
-rw-r--r-- | docker/vpp/vpp-centos8/Dockerfile | 387 | ||||
-rw-r--r-- | docker/vpp/vpp-centos8/files/CentOS-AppStream.repo | 19 | ||||
-rw-r--r-- | docker/vpp/vpp-centos8/files/CentOS-Base.repo | 19 | ||||
-rw-r--r-- | docker/vpp/vpp-centos8/files/badkey | 27 | ||||
-rw-r--r-- | docker/vpp/vpp-centos8/files/epel.repo | 25 | ||||
-rw-r--r-- | docker/vpp/vpp-centos8/files/fdio-master.repo | 5 | ||||
-rw-r--r-- | docker/vpp/vpp-centos8/files/jenkins | 1 | ||||
-rw-r--r-- | docker/vpp/vpp-centos8/files/lf-update-java-alternatives | 57 | ||||
-rw-r--r-- | docker/vpp/vpp-centos8/files/sshconfig | 3 | ||||
-rw-r--r-- | docker/vpp/vpp-centos8/files/supervisord.conf | 23 |
10 files changed, 0 insertions, 566 deletions
diff --git a/docker/vpp/vpp-centos8/Dockerfile b/docker/vpp/vpp-centos8/Dockerfile deleted file mode 100644 index ea671452c..000000000 --- a/docker/vpp/vpp-centos8/Dockerfile +++ /dev/null @@ -1,387 +0,0 @@ -FROM centos:8 -MAINTAINER Ed Kern <ejk@cisco.com> -LABEL Description="VPP centos8 OS build image" -LABEL Vendor="cisco.com" -LABEL Version="0.02" - -# Setup the environment - -RUN mkdir /workspace && mkdir -p /etc/ssh && mkdir -p /var/ccache - -ENV CCACHE_DIR=/var/ccache -ENV MAKE_PARALLEL_FLAGS -j 4 -ENV VPP_ZOMBIE_NOCHECK=1 -ENV DPDK_DOWNLOAD_DIR=/w/Downloads -ENV VPP_PYTHON_PREFIX=/var/cache/vpp/python -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -ENV NOTVISIBLE "in users profile" - -#SSH timeout -#RUN touch /etc/ssh/ssh_config -RUN echo "TCPKeepAlive true" | tee -a /etc/ssh/ssh_config #>/dev/null 2>&1 -RUN echo "ServerAliveCountMax 30" | tee -a /etc/ssh/ssh_config #>/dev/null 2>&1 -RUN echo "ServerAliveInterval 10" | tee -a /etc/ssh/ssh_config #>/dev/null 2>&1 - -# Configure locales -#RUN localectl set-locale "en_US.UTF-8" \ -# && localectl status - -#module -RUN echo uio_pci_generic >> /etc/modules - -ADD files/CentOS-AppStream.repo /etc/yum.repos.d/CentOS-AppStream.repo -ADD files/CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo - -#RUN yum update -y && yum install -y deltarpm && yum clean all -#RUN yum update -y && yum install -y @base https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && yum clean all -RUN yum update -y && yum install -y epel-release && yum clean all -ADD files/epel.repo /etc/yum.repos.d/epel.repo - -RUN yum update -y && yum install -y --enablerepo=epel \ - chrpath \ - git \ -# git-review \ - java-*-openjdk-devel \ - jq \ -# lcov \ - make \ -# nasm \ - sudo \ - unzip \ - xz \ - wget \ - nano \ - && yum clean all - -#packer install -#RUN wget https://releases.hashicorp.com/packer/1.1.3/packer_1.1.3_linux_amd64.zip && unzip packer_1.1.3_linux_amd64.zip -d /usr/local/bin/ && mv /usr/local/bin/packer /usr/local/bin/packer.io - - -RUN yum update -y && yum install -y --enablerepo=epel \ - asciidoc \ - apr-devel \ - cpp \ -# c++ \ - cmake \ -# dblatex \ -# doxygen \ - epel-rpm-macros \ - gcc \ - graphviz \ - indent \ - kernel-devel \ - libxml2 \ - libffi-devel \ - make \ - openssl-devel \ - python2-devel \ - python2-virtualenv \ - python2-setuptools \ -# python2-cffi \ - python2-pip \ - python2-jinja2 \ -# python2-sphinx \ - source-highlight \ - rpm \ - valgrind \ - yum-utils \ - && yum clean all - -RUN yum update -y && yum install -y \ -# ganglia-devel \ - libconfuse-devel \ - mock \ - && yum clean all - -#RUN alternatives --set java /usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java -#RUN alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64 - -RUN pip2 install --upgrade pip -RUN pip2 install pycap scapy - -RUN yum update -y && yum install -y --enablerepo=epel \ - autoconf \ - automake \ - bison \ - ccache \ - cscope \ - curl \ - dkms \ - git \ -# git-review \ - libtool \ -# libconfuse-dev \ -# libpcap-devel \ - libcap-devel \ - scapy \ - && yum clean all - -#puppet -RUN yum update -y && yum install -y --enablerepo=epel \ - libxml2-devel \ - libxslt-devel \ - ruby-devel \ - zlib-devel \ - gcc-c++ \ - && yum clean all - -#outdated ruby pos -RUN yum update -y && yum install -y --enablerepo=epel \ - git-core \ - zlib \ - zlib-devel \ - gcc-c++ \ - patch \ - readline \ - readline-devel \ -# libyaml-devel \ - libffi-devel \ - openssl-devel \ - make \ - bzip2 \ - autoconf \ - automake \ - libtool \ - bison \ - curl \ - sqlite-devel \ - && yum clean all - -ENV PATH="/root/.rbenv/bin:${PATH}" -ENV PATH="/root/.rbenv/shims:${PATH}" - -RUN curl -sL https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-installer | bash - -RUN rbenv init - -RUN rbenv install 2.5.1 && rbenv global 2.5.1 -#&& echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc && echo 'eval "$(rbenv init -)"' >> ~/.bashrc && - - -RUN gem install rake -RUN gem install package_cloud - -RUN yum update -y && yum install -y --enablerepo=epel \ - apr-util \ - byacc \ - diffstat \ - dwz \ - flex \ - gcc-gfortran \ - gettext-devel \ - glibc \ - glibc-langpack-en \ - intltool \ -# nasm \ - patchutils \ -# rcs \ - redhat-lsb \ - redhat-rpm-config \ - rpm-build \ - rpm-sign \ - subversion \ - swig \ - systemtap \ - && yum clean all - -#RUN yum update -y && yum install -y --enablerepo=epel-debuginfo --enablerepo=base-debuginfo \ -# RUN yum update -y && yum install -y --enablerepo=epel-debuginfo \ -# e2fsprogs-debuginfo \ -# glibc-debuginfo \ -# krb5-debuginfo \ -# nss-softokn-debuginfo \ -# openssl-debuginfo \ -# yum-plugin-auto-update-debug-info \ -# zlib-debuginfo \ -# glibc-debuginfo-common \ -# && yum clean all - -RUN yum update -y && yum groupinstall -y "development tools" \ - && yum clean all -# Libraries needed during compilation to enable all features of Python: -RUN yum update -y \ - && yum install -y --enablerepo=epel \ - zlib-devel \ - bzip2-devel \ - openssl-devel \ - ncurses-devel \ - sqlite-devel \ - readline-devel \ - tk-devel \ - gdbm-devel \ -# db4-devel \ -# libpcap-devel \ - xz-devel \ - expat-devel \ - wget \ - clang \ - llvm \ - numactl-devel \ - check-devel \ - check \ - boost \ - boost-devel \ - mbedtls-devel \ - xmlstarlet \ -# centos-release-scl \ - yamllint \ - && yum clean all - -#centos8 -RUN dnf config-manager --set-enabled PowerTools \ - && yum install -y --enablerepo=epel \ - compat-openssl10 \ - python3-jsonschema \ - selinux-policy \ - selinux-policy-devel \ - glibc-static \ - ninja-build \ - && yum clean all - -# Python 2.7.13: -# RUN wget http://python.org/ftp/python/2.7.13/Python-2.7.13.tar.xz \ -# && tar xf Python-2.7.13.tar.xz \ -# && cd Python-2.7.13 \ -# && ./configure --prefix=/usr/local --enable-unicode=ucs4 --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib" \ -# && make \ -# && make install \ -# && strip /usr/local/lib/libpython2.7.so.1.0 \ -# && cd .. \ -# && rm -rf Python* \ -# && wget https://bootstrap.pypa.io/get-pip.py \ -# && /usr/local/bin/python get-pip.py - -RUN pip2 install six scapy==2.3.3 pyexpect subprocess32 cffi git+https://github.com/klement/py-lispnetworking@setup ply -RUN mkdir -p /w/workspace && mkdir -p /var/ccache && ln -s /var/ccache /tmp/ccache -ENV CCACHE_DIR=/var/ccache -ENV CCACHE_READONLY=true -RUN mkdir -p /var/cache/vpp/python -RUN mkdir -p /w/Downloads -# RUN wget -O /w/Downloads/dpdk-18.02.1.tar.xz http://dpdk.org/browse/dpdk-stable/snapshot/dpdk-stable-18.02.1.tar.xz -# RUN wget -O /w/Downloads/dpdk-18.05.tar.xz http://dpdk.org/browse/dpdk/snapshot/dpdk-18.05.tar.xz -# RUN wget -O /w/Downloads/v0.47.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.47.tar.gz -# RUN wget -O /w/Downloads/v0.48.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.48.tar.gz -# RUN wget -O /w/Downloads/v0.49.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.49.tar.gz - -ADD files/lf-update-java-alternatives /usr/local/bin/lf-update-java-alternatives -RUN chmod 755 /usr/local/bin/lf-update-java-alternatives -#RUN curl -s https://packagecloud.io/install/repositories/fdio/master/script.rpm.sh | sudo bash - -# CSIT requirements -RUN dnf config-manager --set-enabled PowerTools \ - && yum install -y --enablerepo=epel \ - curl \ - git \ - libpcap-devel \ - openssh-clients \ - openssh-server \ - net-tools \ - pciutils \ - python3-cffi \ - python3-pip \ - python3-setuptools \ - socat \ - sshpass \ - strongswan \ - sudo \ - supervisor \ - tar \ - tcpdump \ - unzip \ - vim \ - virtualenv \ - wget \ - zlib-devel \ - && yum clean all - -# CSIT PIP pre-cache -RUN pip3 install \ - ecdsa==0.13.3 \ - paramiko==2.6.0 \ - pycrypto==2.6.1 \ - pypcap==1.2.3 \ - PyYAML==5.1.1 \ - requests==2.22.0 \ - robotframework==3.1.2 \ - scapy==2.4.3 \ - scp==0.13.2 \ - ansible==2.7.8 \ - dill==0.2.8.2 \ - numpy==1.17.3 \ - hdrhistogram==0.6.1 \ - pandas==0.25.3 \ - plotly==4.1.1 \ - PTable==0.9.2 \ - Sphinx==2.2.1 \ - sphinx-rtd-theme==0.4.0 \ - sphinxcontrib-programoutput==0.15 \ - sphinxcontrib-robotdoc==0.11.0 \ - ply==3.11 \ - alabaster==0.7.12 \ - Babel==2.7.0 \ - bcrypt==3.1.7 \ - certifi==2019.9.11 \ - cffi==1.13.2 \ - chardet==3.0.4 \ - cryptography==2.8 \ - docutils==0.15.2 \ - future==0.18.2 \ - idna==2.8 \ - imagesize==1.1.0 \ - Jinja2==2.10.3 \ - MarkupSafe==1.1.1 \ - packaging==19.2 \ - pbr==5.4.3 \ - pycparser==2.19 \ - Pygments==2.4.2 \ - PyNaCl==1.3.0 \ - pyparsing==2.4.4 \ - python-dateutil==2.8.1 \ - pytz==2019.3 \ - retrying==1.3.3 \ - six==1.13.0 \ - snowballstemmer==2.0.0 \ - sphinxcontrib-applehelp==1.0.1 \ - sphinxcontrib-devhelp==1.0.1 \ - sphinxcontrib-htmlhelp==1.0.2 \ - sphinxcontrib-jsmath==1.0.1 \ - sphinxcontrib-qthelp==1.0.2 \ - sphinxcontrib-serializinghtml==1.1.3 \ - urllib3==1.25.6 - -# CSIT ARM workaround -RUN pip3 install scipy==1.1.0 - -# Configure locales -#RUN localectl set-locale "en_US.UTF-8" \ -# && localectl status - -# Fix permissions -# RUN chown root:syslog /var/log \ -# && chmod 755 /etc/default - -# Create directory structure -RUN mkdir -p /tmp/dumps \ - && mkdir -p /var/cache/vpp/python \ - && mkdir -p /var/run/sshd - -# SSH settings -RUN echo 'root:Csit1234' | chpasswd \ - && sed -i 's/#PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config \ - && sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd \ - && echo "export VISIBLE=now" >> /etc/profile - -ADD files/sshconfig /root/.ssh/config -ADD files/badkey /root/.ssh/id_rsa -RUN chmod 600 /root/.ssh/id_rsa -#RUN mv /usr/bin/sar /usr/bin/sar.old && ln -s /bin/true /usr/bin/sar -RUN ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N '' && ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' && ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N '' - -#include bits from registry image -RUN rm -rf /home/jenkins && useradd -ms /bin/bash jenkins && chown -R jenkins /w && chown -R jenkins /var/ccache && chown -R jenkins /var/cache/vpp #&& mv /usr/bin/sar /usr/bin/sar.old && ln -s /bin/true /usr/bin/sar -ADD files/jenkins /etc/sudoers.d/jenkins -ADD files/supervisord.conf /etc/supervisord/supervisord.conf -ENV PATH=/root/.local/bin:/home/jenkins/.local/bin:${PATH} - -#csit-sut ssh bits for the end -EXPOSE 22 - -CMD ["sh", "-c", "rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api; /usr/bin/supervisord -c /etc/supervisord/supervisord.conf; /usr/sbin/sshd -D"] diff --git a/docker/vpp/vpp-centos8/files/CentOS-AppStream.repo b/docker/vpp/vpp-centos8/files/CentOS-AppStream.repo deleted file mode 100644 index 16828095f..000000000 --- a/docker/vpp/vpp-centos8/files/CentOS-AppStream.repo +++ /dev/null @@ -1,19 +0,0 @@ -# CentOS-AppStream.repo -# -# The mirror system uses the connecting IP address of the client and the -# update status of each mirror to pick mirrors that are updated to and -# geographically close to the client. You should use this for CentOS updates -# unless you are manually picking other mirrors. -# -# If the mirrorlist= does not work for you, as a fall back you can try the -# remarked out baseurl= line instead. -# -# - -[AppStream] -name=CentOS-$releasever - AppStream -mirrorlist=http://mirrorlist.centos.org/?release=8&arch=$basearch&repo=AppStream&infra=$infra -#baseurl=http://mirror.centos.org/$contentdir/$releasever/AppStream/$basearch/os/ -gpgcheck=1 -enabled=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial diff --git a/docker/vpp/vpp-centos8/files/CentOS-Base.repo b/docker/vpp/vpp-centos8/files/CentOS-Base.repo deleted file mode 100644 index 81df950b2..000000000 --- a/docker/vpp/vpp-centos8/files/CentOS-Base.repo +++ /dev/null @@ -1,19 +0,0 @@ -# CentOS-Base.repo -# -# The mirror system uses the connecting IP address of the client and the -# update status of each mirror to pick mirrors that are updated to and -# geographically close to the client. You should use this for CentOS updates -# unless you are manually picking other mirrors. -# -# If the mirrorlist= does not work for you, as a fall back you can try the -# remarked out baseurl= line instead. -# -# - -[BaseOS] -name=CentOS-$releasever - Base -mirrorlist=http://mirrorlist.centos.org/?release=8&arch=$basearch&repo=BaseOS&infra=$infra -#baseurl=http://mirror.centos.org/$contentdir/$releasever/BaseOS/$basearch/os/ -gpgcheck=1 -enabled=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial diff --git a/docker/vpp/vpp-centos8/files/badkey b/docker/vpp/vpp-centos8/files/badkey deleted file mode 100644 index 2270aff09..000000000 --- a/docker/vpp/vpp-centos8/files/badkey +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAslDXf4kZOQI8OGQQdIF8o83nBM0B4fzHLYLxxiY2rKiQ5MGM -mQa7p1KKzmd5/NlvFRnXefnjSDQljjPxEY7mh457rX2nXvqHD4GUXZPpBIE73rQ1 -TViIAXdDzFXJ6ee4yX8ewmVakzYBnlUPDidkWyRnjm/xCgKUCO+CD5AH3ND0onks -OYAtHqhDh29/QMIKdMnK87FBxfzhInHwpqPur76zBnpw3u36ylKEymDFrO5dwzsh -QvDWjsYRg9ydTXubtwP6+MOpjdR1SNKxcCHKJrPrdAeJW9jg1imYmYpEHZ/P3qsL -Jm0hGWbFjdxZLIYIz0vN/nTalcAeqT2OWKrXuwIDAQABAoIBAQCcj1g2FOR9ZlYD -WPANqucJVy4/y9OcXHlwnyiyRjj47WOSRdGxRfUa2uEeikHT3ACo8TB8WwfQDGDw -8u/075e+az5xvAJo5OQSnD3sz4Hmv6UWSvkFuPZo+xMe5C/M2/QljiQuoBifaeqP -3rTCQ5ncYCFAMU7b8BmTot551Ybhu2jCbDMHU7nFHEFOvYinkwfVcaqkrVDUuH+D -c3NkAEH9Jz2MEYA2Va4uqFpGt5lfGiED2kMenwPa8eS5LS5HJsxkfMHGlaHXHFUb -D+dG/qJtSslVxdzVPgEGvzswo6TgtY1nZTQcB8U63rktFg38B7QGtOkvswAYzxyk -HdMIiU3RAoGBAOdIEQRcAThj9eiIFywtBgLBOSg4SoOnvELLr6lgUg2+ICmx06LQ -yaai1QRdOWw1VwZ6apNCD00kaUhBu+ou93yLSDnR2uYftkylhcnVuhDyIeNyb81V -hV2z0WuNv3aKBFlBxaq391S7WW1XxhpAAagm8fZZur73wV390EVd/hZJAoGBAMVf -negT2bg5PVKWvsiEU6eZ00W97tlEDLclkiZawXNnM2/c+2x1Tks6Yf1E/j2FFTB4 -r0fesbwN346hCejtq5Bup5YEdFA3KtwT5UyeQQLFGYlCtRmBtOd10wkRS93D0tpX -iIqkf43Gpx6iFdvBWY5A7N+ZmojCy9zpL5TJ4G3jAoGADOGEoRuGrd9TWMoLkFhJ -l2mvhz/rVn3HDGlPtT06FK3cGLZgtRavxGoZNw8CHbayzBeRS/ZH5+H5Qx72GkrX -WcZgFWhMqrhlbMtjMiSHIl556LL86xCyRs+3ACh6211AdMAnBCUOz1dH2cEjtV6P -ORBCNZg1wGEIEfYK3XIorpECgYBubXfQj8KhUs0fdx3Y3Ehdni/ZdlG7F1qx4YBq -mx5e7d+Wd6Hn5Z3fcxO9+yrvypS3YN5YrJzuZSiuCSWdP9RcY7y5r1ZQRv1g0nTZ -MDWZUiNea4cddTd8xKxFB3tV4SkIZi8LustuzDVWa0Mlh4EOmP6uf6c5WxtqRsEL -UwORFwKBgEjZsfmZGBurjOtSrcsteulOB0D2nOqPVRWXmbSNJT/l73DkEllvVyA/ -wdW39nyFrA2Qw1K2F+l8DkzMd/WEjmioSWCsvTkXlvrqPfByKg01zCbYy/mhRW7d -7sQrPOIl8ygsc3JrxmvzibdWmng1MehvpAM1ogWeTUa1lsDTNJ/6 ------END RSA PRIVATE KEY----- diff --git a/docker/vpp/vpp-centos8/files/epel.repo b/docker/vpp/vpp-centos8/files/epel.repo deleted file mode 100644 index 9083b454e..000000000 --- a/docker/vpp/vpp-centos8/files/epel.repo +++ /dev/null @@ -1,25 +0,0 @@ -[epel] -name=Extra Packages for Enterprise Linux $releasever - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch&infra=$infra&content=$contentdir -enabled=1 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 - -[epel-debuginfo] -name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-8&arch=$basearch&infra=$infra&cont -ent=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 - -[epel-source] -name=Extra Packages for Enterprise Linux $releasever - $basearch - Source -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/SRPMS -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-8&arch=$basearch&infra=$infra&con -tent=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1
\ No newline at end of file diff --git a/docker/vpp/vpp-centos8/files/fdio-master.repo b/docker/vpp/vpp-centos8/files/fdio-master.repo deleted file mode 100644 index b3b279fed..000000000 --- a/docker/vpp/vpp-centos8/files/fdio-master.repo +++ /dev/null @@ -1,5 +0,0 @@ -[fdio-master] -name=fd.io master branch latest merge -baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7 -enabled=1 -gpgcheck=0 diff --git a/docker/vpp/vpp-centos8/files/jenkins b/docker/vpp/vpp-centos8/files/jenkins deleted file mode 100644 index 92f8a3435..000000000 --- a/docker/vpp/vpp-centos8/files/jenkins +++ /dev/null @@ -1 +0,0 @@ -jenkins ALL=(root) NOPASSWD:ALL diff --git a/docker/vpp/vpp-centos8/files/lf-update-java-alternatives b/docker/vpp/vpp-centos8/files/lf-update-java-alternatives deleted file mode 100644 index 8484a711b..000000000 --- a/docker/vpp/vpp-centos8/files/lf-update-java-alternatives +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: EPL-1.0 -############################################################################## -# Copyright (c) 2018 The Linux Foundation and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -############################################################################## - -# This script takes the java-version variable to set the proper alternative -# for java, javac and java_sdk_openjdk for ubuntu or centos/fedora/redhat distros - -JAVA_ENV_FILE="/tmp/java.env" - -update-java-redhat() { - if [[ "${SET_JDK_VERSION//[a-zA-Z]/}" = "11" ]]; then - export JAVA_HOME="/usr/lib/jvm/java-11-openjdk" - else - export JAVA_HOME="/usr/lib/jvm/java-1.${SET_JDK_VERSION//[a-zA-Z:-]/}.0-openjdk" - fi - sudo /usr/sbin/alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1 - sudo /usr/sbin/alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1 - sudo /usr/sbin/alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1 - sudo /usr/sbin/alternatives --set java "${JAVA_HOME}/bin/java" - sudo /usr/sbin/alternatives --set javac "${JAVA_HOME}/bin/javac" - sudo /usr/sbin/alternatives --set java_sdk_openjdk "${JAVA_HOME}" - echo JAVA_HOME="$JAVA_HOME" > "$JAVA_ENV_FILE" -} - -update-java-ubuntu() { - export JAVA_HOME="/usr/lib/jvm/java-${SET_JDK_VERSION//[a-zA-Z:-]/}-openjdk-amd64" - sudo /usr/bin/update-alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1 - sudo /usr/bin/update-alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1 - sudo /usr/bin/update-alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1 - sudo /usr/bin/update-alternatives --set java "${JAVA_HOME}/bin/java" - sudo /usr/bin/update-alternatives --set javac "${JAVA_HOME}/bin/javac" - sudo /usr/bin/update-alternatives --set java_sdk_openjdk "${JAVA_HOME}" - echo JAVA_HOME="$JAVA_HOME" > "$JAVA_ENV_FILE" -} - -echo "---> Updating Java version" -OS=$(facter operatingsystem | tr '[:upper:]' '[:lower:]') - -case "${OS}" in - fedora|centos|redhat) - echo "---> RedHat type system detected" - update-java-redhat - ;; - ubuntu) - echo "---> Ubuntu system detected" - update-java-ubuntu - ;; -esac -java -version -echo JAVA_HOME="${JAVA_HOME}" diff --git a/docker/vpp/vpp-centos8/files/sshconfig b/docker/vpp/vpp-centos8/files/sshconfig deleted file mode 100644 index 8dd13540f..000000000 --- a/docker/vpp/vpp-centos8/files/sshconfig +++ /dev/null @@ -1,3 +0,0 @@ -Host * - StrictHostKeyChecking no - UserKnownHostsFile=/dev/null diff --git a/docker/vpp/vpp-centos8/files/supervisord.conf b/docker/vpp/vpp-centos8/files/supervisord.conf deleted file mode 100644 index 7e72d666a..000000000 --- a/docker/vpp/vpp-centos8/files/supervisord.conf +++ /dev/null @@ -1,23 +0,0 @@ -[unix_http_server] -file = /run/supervisor.sock - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[supervisorctl] -serverurl = unix:///run/supervisor.sock - -[supervisord] -pidfile = /run/supervisord.pid -identifier = supervisor -directory = /run -logfile=/var/log/supervisord.log -loglevel=debug -nodaemon=false - -[program:vpp] -command=/usr/bin/vpp -c /etc/vpp/startup.conf -autostart=false -autorestart=true -redirect_stderr=true -priority=1 |