Skip to content

Commit

Permalink
Merge pull request #236 from uilianries/hotfix/centos6-gcc7
Browse files Browse the repository at this point in the history
Deprecate CentOS 6
  • Loading branch information
uilianries authored Dec 15, 2020
2 parents 471fdb1 + 5b868c1 commit 55375ef
Show file tree
Hide file tree
Showing 10 changed files with 4 additions and 339 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ GCC>=5 is ABI compatible for minor versions. To solve multiple minors, there are
| [conanio/gcc6-armv7hf: gcc 6](https://hub.docker.com/r/conanio/gcc6-armv7hf/) | armv7hf | Supported |
| [conanio/gcc7-x86: gcc 7](https://hub.docker.com/r/conanio/gcc7-x86/) | x86 | Supported |
| [conanio/gcc7: gcc 7](https://hub.docker.com/r/conanio/gcc7/) | x86_64 | Supported |
| [conanio/gcc7-centos6: gcc 7](https://hub.docker.com/r/conanio/gcc7-centos6/) | x86_64 | Supported |
| [conanio/gcc7-centos6-x86: gcc 7](https://hub.docker.com/r/conanio/gcc7-centos6-x86/) | x86 | Supported |
| [conanio/gcc7-centos6: gcc 7](https://hub.docker.com/r/conanio/gcc7-centos6/) | x86_64 | Deprecated |
| [conanio/gcc7-centos6-x86: gcc 7](https://hub.docker.com/r/conanio/gcc7-centos6-x86/) | x86 | Deprecated |
| [conanio/gcc7-mingw: gcc 7](https://hub.docker.com/r/conanio/gcc7-mingw/) | x86_64 | Supported |
| [conanio/gcc7-armv7: gcc 7](https://hub.docker.com/r/conanio/gcc7-armv7/) | armv7 | Supported |
| [conanio/gcc7-armv7hf: gcc 7](https://hub.docker.com/r/conanio/gcc7-armv7hf/) | armv7hf | Supported |
Expand Down Expand Up @@ -115,6 +115,8 @@ Conan Docker Tools provides an image version with only Conan Server installed, v

**conanio/gcc7-centos6-x86** is a special image version based on CentOS 6 i386, GCC 7 and **glibc 2.12** (very old glibc version). This is intended to build executables that run almost on any Linux because **glibc** guarantees backward compatibility. You can use this image to build your Conan build tools packages (`build_requires`). This image is **ONLY** able to build **x86** binaries.

** WARNING ** CentOS 6 reached [EOL](https://wiki.centos.org/About/Product) and won't be longer maintained. Thus, both `conanio/gcc7-centos6` and `conanio/gcc7-centos6-x86` are still available for download, but no new version will be released.

Use the images to test your C++ project in Travis CI
======================================================

Expand Down
8 changes: 0 additions & 8 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ jobs:
Conan Tests Agent:
BUILD_CONAN_TEST_AGENT: 1

CentOS 6 GCC 7 x86_64:
GCC_VERSIONS: "7"
DOCKER_ARCHS: "x86_64"
DOCKER_DISTRO: "centos6,jnlp-slave-centos6"
CentOS 6 GCC 7 x86:
GCC_VERSIONS: "7"
DOCKER_ARCHS: "x86"
DOCKER_DISTRO: "centos6,jnlp-slave-centos6"
Ubuntu MinGW GCC 7 x86_64:
GCC_VERSIONS: "7"
DOCKER_ARCHS: "x86_64"
Expand Down
30 changes: 0 additions & 30 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -394,20 +394,6 @@ services:
CONAN_VERSION: ${CONAN_VERSION}
image: "${DOCKER_USERNAME}/conan_server:${DOCKER_BUILD_TAG}"
container_name: conan_server
gcc7-centos6:
build:
context: gcc_7-centos6
dockerfile: Dockerfile
image: "${DOCKER_USERNAME}/gcc7-centos6:${DOCKER_BUILD_TAG}"
container_name: gcc7-centos6
tty: true
gcc7-centos6-x86:
build:
context: gcc_7-centos6-x86
dockerfile: Dockerfile
image: "${DOCKER_USERNAME}/gcc7-centos6-x86:${DOCKER_BUILD_TAG}"
container_name: gcc7-centos6-x86
tty: true
clang8:
build:
context: clang_8
Expand Down Expand Up @@ -620,22 +606,6 @@ services:
image: "${DOCKER_USERNAME}/gcc9-jnlp-slave-x86:${DOCKER_BUILD_TAG}"
container_name: gcc9-jnlp-slave-x86
tty: true
gcc7-jnlp-slave-centos6:
build:
context: jenkins-jnlp-slave
dockerfile: centos6/Dockerfile
args:
SOURCE_CONANIO_IMAGE: conanio/gcc7-centos6
image: "${DOCKER_USERNAME}/gcc7-jnlp-slave-centos6:${DOCKER_BUILD_TAG}"
container_name: gcc7-jnlp-slave-centos6
gcc7-jnlp-slave-centos6-x86:
build:
context: jenkins-jnlp-slave
dockerfile: centos6/Dockerfile
args:
SOURCE_CONANIO_IMAGE: conanio/gcc7-centos6-x86
image: "${DOCKER_USERNAME}/gcc7-jnlp-slave-centos6-x86:${DOCKER_BUILD_TAG}"
container_name: gcc7-jnlp-slave-centos6-x86
clang39-jnlp-slave:
build:
context: jenkins-jnlp-slave
Expand Down
7 changes: 0 additions & 7 deletions gcc_7-centos6-x86/.dockerignore

This file was deleted.

127 changes: 0 additions & 127 deletions gcc_7-centos6-x86/Dockerfile

This file was deleted.

5 changes: 0 additions & 5 deletions gcc_7-centos6-x86/cloudlinux.repo

This file was deleted.

32 changes: 0 additions & 32 deletions gcc_7-centos6-x86/sudo

This file was deleted.

7 changes: 0 additions & 7 deletions gcc_7-centos6/.dockerignore

This file was deleted.

89 changes: 0 additions & 89 deletions gcc_7-centos6/Dockerfile

This file was deleted.

32 changes: 0 additions & 32 deletions gcc_7-centos6/sudo

This file was deleted.

0 comments on commit 55375ef

Please sign in to comment.