consolidate tester's Dockerfile

thelastpickle · Jan 8, 2025 · 3eaa2a6 · 3eaa2a6
1 parent fff2010
commit 3eaa2a6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 76 deletions.
diff --git a/packaging/docker-build/Dockerfile-debian-11-tester b/packaging/docker-build/Dockerfile-debian-11-tester
diff --git a/packaging/docker-build/Dockerfile-debian-12-tester b/packaging/docker-build/Dockerfile-debian-12-tester
diff --git a/...ing/docker-build/Dockerfile-ubuntu-tester → packaging/docker-build/Dockerfile-tester b/...ing/docker-build/Dockerfile-ubuntu-tester → packaging/docker-build/Dockerfile-tester
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-ARG EXTRA_PACKAGES="python-dev python-pip"
 ARG BUILD_IMAGE=ubuntu:18.04
 FROM ${BUILD_IMAGE}
 

diff --git a/packaging/docker-build/docker-compose.yml b/packaging/docker-build/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       platforms:
         - linux/amd64
       context: ../..
-      dockerfile: packaging/docker-build/Dockerfile-ubuntu-tester
+      dockerfile: packaging/docker-build/Dockerfile-tester
       args:
         - BUILD_IMAGE=ubuntu:20.04
     volumes:
@@ -53,7 +53,7 @@ services:
       platforms:
         - linux/amd64
       context: ../..
-      dockerfile: packaging/docker-build/Dockerfile-debian-11-tester
+      dockerfile: packaging/docker-build/Dockerfile-tester
       args:
         - BUILD_IMAGE=debian:bullseye
     volumes:
@@ -75,7 +75,7 @@ services:
       platforms:
         - linux/amd64
       context: ../..
-      dockerfile: packaging/docker-build/Dockerfile-debian-12-tester
+      dockerfile: packaging/docker-build/Dockerfile-tester
       args:
         - BUILD_IMAGE=debian:bookworm
     volumes: