small cleanup for centos and amazonlinux

motivation: cleanup

changes:
* better name for docker container
* group source moving together

Author: tomerd

platforms/Linux/RPM/Amazonlinux/2/docker-compose.yaml

@@ -17,13 +17,13 @@ version: "2"
 services:
 
   docker-setup:
-    image: amazonlinux2-rpm-builder
+    image: amazonlinux-2-rpm-builder
     build:
       context: .
       dockerfile: Dockerfile
 
   common: &common
-    image: amazonlinux2-rpm-builder
+    image: amazonlinux-2-rpm-builder
     depends_on: [docker-setup]
     volumes:
       - .:/code:z

platforms/Linux/RPM/Amazonlinux/2/swiftlang.spec

@@ -115,11 +115,7 @@ mv swift-driver-swift-%{swift_version} swift-driver
 mv swift-crypto-%{swift_crypto_version} swift-crypto
 mv ninja-%{ninja_version} ninja
 mv CMake-%{cmake_version} cmake
-
-# ICU
 mv icu-release-%{icu_version} icu
-
-# Yams
 mv Yams-%{yams_version} yams
 
 # Adjust python version swift-api-checker

platforms/Linux/RPM/Centos/7/docker-compose.yaml

@@ -17,13 +17,13 @@ version: "2"
 services:
 
   docker-setup:
-    image: centos7-rpm-builder
+    image: centos-7-rpm-builder
     build:
       context: .
       dockerfile: Dockerfile
 
   common: &common
-    image: centos7-rpm-builder
+    image: centos-7-rpm-builder
     depends_on: [docker-setup]
     # https://bugs.swift.org/browse/SR-15343
     security_opt:

platforms/Linux/RPM/Centos/7/swiftlang.spec

@@ -115,11 +115,7 @@ mv swift-driver-swift-%{swift_version} swift-driver
 mv swift-crypto-%{swift_crypto_version} swift-crypto
 mv ninja-%{ninja_version} ninja
 mv CMake-%{cmake_version} cmake
-
-# ICU
 mv icu-release-%{icu_version} icu
-
-# Yams
 mv Yams-%{yams_version} yams
 
 # Adjust python version swift-api-checker

platforms/Linux/RPM/Centos/8/docker-compose.yaml

@@ -17,13 +17,13 @@ version: "2"
 services:
 
   docker-setup:
-    image: centos8-rpm-builder
+    image: centos-8-rpm-builder
     build:
       context: .
       dockerfile: Dockerfile
 
   common: &common
-    image: centos8-rpm-builder
+    image: centos-8-rpm-builder
     depends_on: [docker-setup]
     # https://bugs.swift.org/browse/SR-15343
     security_opt:

platforms/Linux/RPM/Centos/8/swiftlang.spec

@@ -114,11 +114,7 @@ mv swift-driver-swift-%{swift_version} swift-driver
 mv swift-crypto-%{swift_crypto_version} swift-crypto
 mv ninja-%{ninja_version} ninja
 mv CMake-%{cmake_version} cmake
-
-# ICU
 mv icu-release-%{icu_version} icu
-
-# Yams
 mv Yams-%{yams_version} yams
 
 # Adjust python version swift-api-checker