[PATCH v3 0/6] docker: misc cleanups

John Snow posted 6 patches 4 years, 6 months ago
Failed in applying to current master (apply log)
tests/docker/Makefile.include                 |  9 +++--
tests/docker/dockerfiles/centos7.docker       |  2 +-
tests/docker/dockerfiles/debian-ports.docker  | 36 -------------------
tests/docker/dockerfiles/debian-sid.docker    | 35 ------------------
.../dockerfiles/debian-xtensa-cross.docker    |  2 +-
tests/docker/dockerfiles/debian10.docker      |  2 +-
tests/docker/dockerfiles/debian8.docker       | 34 ------------------
tests/docker/dockerfiles/debian9.docker       |  2 +-
tests/docker/dockerfiles/travis.docker        |  2 +-
tests/docker/dockerfiles/ubuntu.docker        |  2 +-
tests/docker/dockerfiles/ubuntu1804.docker    |  2 +-
11 files changed, 11 insertions(+), 117 deletions(-)
delete mode 100644 tests/docker/dockerfiles/debian-ports.docker
delete mode 100644 tests/docker/dockerfiles/debian-sid.docker
delete mode 100644 tests/docker/dockerfiles/debian8.docker
[PATCH v3 0/6] docker: misc cleanups
Posted by John Snow 4 years, 6 months ago
This should include anything I've sent so far (not including the RFC for
more exploratory changes) that hasn't already been included in a roundup
by Alex Bennée.

Mostly, it removes unused docker files and replaces python2 with python3
in all of the container environments.

V3:
- Reorder patches to remove everything first, THEN patch for python3
- Split removal of debian-ports and debian-sid into two patches.

V2:
- Rolled in python2 --> python3 conversion
- Added travis conversion to python patch
- Remove debian8 dockerfile, which is also now unused.

John Snow (6):
  docker: remove debian8-mxe definitions
  docker: removed unused debian8 partial image
  docker: remove 'deprecated' image definitions
  docker: remove unused debian-ports
  docker: remove unused debian-sid
  docker: move tests from python2 to python3

 tests/docker/Makefile.include                 |  9 +++--
 tests/docker/dockerfiles/centos7.docker       |  2 +-
 tests/docker/dockerfiles/debian-ports.docker  | 36 -------------------
 tests/docker/dockerfiles/debian-sid.docker    | 35 ------------------
 .../dockerfiles/debian-xtensa-cross.docker    |  2 +-
 tests/docker/dockerfiles/debian10.docker      |  2 +-
 tests/docker/dockerfiles/debian8.docker       | 34 ------------------
 tests/docker/dockerfiles/debian9.docker       |  2 +-
 tests/docker/dockerfiles/travis.docker        |  2 +-
 tests/docker/dockerfiles/ubuntu.docker        |  2 +-
 tests/docker/dockerfiles/ubuntu1804.docker    |  2 +-
 11 files changed, 11 insertions(+), 117 deletions(-)
 delete mode 100644 tests/docker/dockerfiles/debian-ports.docker
 delete mode 100644 tests/docker/dockerfiles/debian-sid.docker
 delete mode 100644 tests/docker/dockerfiles/debian8.docker

-- 
2.21.0


Re: [PATCH v3 0/6] docker: misc cleanups
Posted by Alex Bennée 4 years, 6 months ago
John Snow <jsnow@redhat.com> writes:

> This should include anything I've sent so far (not including the RFC for
> more exploratory changes) that hasn't already been included in a roundup
> by Alex Bennée.

Queued to testing/next, thanks.
>
> Mostly, it removes unused docker files and replaces python2 with python3
> in all of the container environments.
>
> V3:
> - Reorder patches to remove everything first, THEN patch for python3
> - Split removal of debian-ports and debian-sid into two patches.
>
> V2:
> - Rolled in python2 --> python3 conversion
> - Added travis conversion to python patch
> - Remove debian8 dockerfile, which is also now unused.
>
> John Snow (6):
>   docker: remove debian8-mxe definitions
>   docker: removed unused debian8 partial image
>   docker: remove 'deprecated' image definitions
>   docker: remove unused debian-ports
>   docker: remove unused debian-sid
>   docker: move tests from python2 to python3
>
>  tests/docker/Makefile.include                 |  9 +++--
>  tests/docker/dockerfiles/centos7.docker       |  2 +-
>  tests/docker/dockerfiles/debian-ports.docker  | 36 -------------------
>  tests/docker/dockerfiles/debian-sid.docker    | 35 ------------------
>  .../dockerfiles/debian-xtensa-cross.docker    |  2 +-
>  tests/docker/dockerfiles/debian10.docker      |  2 +-
>  tests/docker/dockerfiles/debian8.docker       | 34 ------------------
>  tests/docker/dockerfiles/debian9.docker       |  2 +-
>  tests/docker/dockerfiles/travis.docker        |  2 +-
>  tests/docker/dockerfiles/ubuntu.docker        |  2 +-
>  tests/docker/dockerfiles/ubuntu1804.docker    |  2 +-
>  11 files changed, 11 insertions(+), 117 deletions(-)
>  delete mode 100644 tests/docker/dockerfiles/debian-ports.docker
>  delete mode 100644 tests/docker/dockerfiles/debian-sid.docker
>  delete mode 100644 tests/docker/dockerfiles/debian8.docker


--
Alex Bennée

Re: [PATCH v3 0/6] docker: misc cleanups
Posted by John Snow 4 years, 6 months ago
CC ehabkost for patch 6/6.

On 9/23/19 2:11 PM, John Snow wrote:
> This should include anything I've sent so far (not including the RFC for
> more exploratory changes) that hasn't already been included in a roundup
> by Alex Bennée.
> 
> Mostly, it removes unused docker files and replaces python2 with python3
> in all of the container environments.
> 
> V3:
> - Reorder patches to remove everything first, THEN patch for python3
> - Split removal of debian-ports and debian-sid into two patches.
> 
> V2:
> - Rolled in python2 --> python3 conversion
> - Added travis conversion to python patch
> - Remove debian8 dockerfile, which is also now unused.
> 
> John Snow (6):
>   docker: remove debian8-mxe definitions
>   docker: removed unused debian8 partial image
>   docker: remove 'deprecated' image definitions
>   docker: remove unused debian-ports
>   docker: remove unused debian-sid
>   docker: move tests from python2 to python3
> 
>  tests/docker/Makefile.include                 |  9 +++--
>  tests/docker/dockerfiles/centos7.docker       |  2 +-
>  tests/docker/dockerfiles/debian-ports.docker  | 36 -------------------
>  tests/docker/dockerfiles/debian-sid.docker    | 35 ------------------
>  .../dockerfiles/debian-xtensa-cross.docker    |  2 +-
>  tests/docker/dockerfiles/debian10.docker      |  2 +-
>  tests/docker/dockerfiles/debian8.docker       | 34 ------------------
>  tests/docker/dockerfiles/debian9.docker       |  2 +-
>  tests/docker/dockerfiles/travis.docker        |  2 +-
>  tests/docker/dockerfiles/ubuntu.docker        |  2 +-
>  tests/docker/dockerfiles/ubuntu1804.docker    |  2 +-
>  11 files changed, 11 insertions(+), 117 deletions(-)
>  delete mode 100644 tests/docker/dockerfiles/debian-ports.docker
>  delete mode 100644 tests/docker/dockerfiles/debian-sid.docker
>  delete mode 100644 tests/docker/dockerfiles/debian8.docker
> 

-- 
—js