diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index 86a8d3ac85..166f3cc0b7 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - centos_ver: [6, 7, 8] + centos_ver: [7, 8] runs-on: ubuntu-20.04 steps: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7e8b5b8942..6778886825 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - centos_ver: [6, 7, 8] + centos_ver: [7, 8] runs-on: ubuntu-20.04 steps: diff --git a/Dockerfiles/centos6.Dockerfile b/Dockerfiles/centos6.Dockerfile deleted file mode 100644 index b5e4c2b2fb..0000000000 --- a/Dockerfiles/centos6.Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -FROM centos:6 as base - -ENV PYTHON python2 -ENV PIP pip2 -ENV PYTHONDONTWRITEBYTECODE 1 - -ENV URL_GET_PIP "https://bootstrap.pypa.io/pip/2.6/get-pip.py" -ENV APP_DEV_DEPS "requirements/centos6.requirements.txt" -ENV APP_MAIN_DEPS \ - python-six \ - pexpect - -WORKDIR /data - -FROM base as install_main_deps -RUN sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Base.repo &&\ - sed -i 's/^#baseurl.*$/baseurl=https:\/\/vault.centos.org\/6.10\/os\/x86_64/g' \ - /etc/yum.repos.d/CentOS-Base.repo -RUN yum update -y && yum install -y $APP_MAIN_DEPS && yum clean all - -FROM install_main_deps as install_dev_deps -RUN curl $URL_GET_PIP | $PYTHON -COPY $APP_DEV_DEPS $APP_DEV_DEPS -RUN $PIP install -r $APP_DEV_DEPS - -FROM install_dev_deps as install_application -RUN groupadd --gid=1000 -r app && \ - useradd -r --uid=1000 --gid=1000 app -RUN chown -R app:app . -COPY --chown=app:app . . -USER app:app diff --git a/Makefile b/Makefile index 6a6fb4fdd9..d69cf55c0a 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,6 @@ clean: images: .images .images: - @docker build -f Dockerfiles/centos6.Dockerfile -t $(IMAGE)/centos6 . @docker build -f Dockerfiles/centos7.Dockerfile -t $(IMAGE)/centos7 . @docker build -f Dockerfiles/centos8.Dockerfile -t $(IMAGE)/centos8 . @docker build -f Dockerfiles/rpmbuild.centos8.Dockerfile -t $(IMAGE)/centos8rpmbuild . @@ -53,8 +52,6 @@ images: .images touch $@ tests: images - @echo 'CentOS Linux 6 tests' - @docker run --user=$(id -ur):$(id -gr) --rm -v $(shell pwd):/data:Z $(IMAGE)/centos6 pytest @echo 'CentOS Linux 7 tests' @docker run --user=$(id -ur):$(id -gr) --rm -v $(shell pwd):/data:Z $(IMAGE)/centos7 pytest @echo 'CentOS Linux 8 tests'