Clean up unused Docker images

b/359451816
youtube · Aug 13, 2024 · 0242c61 · 0242c61
1 parent 9545024
commit 0242c61
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 470 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -64,27 +64,6 @@ x-shared-unittest-definitions: &shared-unittest-definitions
 
 services:
 #### Tools
-  pre-commit:
-    build:
-      context: ./docker/precommit_hooks
-      dockerfile: Dockerfile
-    image: pre-commit
-    volumes:
-    - ${COBALT_SRC:-.}:/code/
-    environment:
-      FROM_REF: ${FROM_REF:-HEAD^1}
-      TO_REF: ${TO_REF:-HEAD}
-
-  pytest:
-    build:
-      context: ./docker/pytest
-      dockerfile: Dockerfile
-    image: cobalt-build-pytest
-    volumes:
-    - ${COBALT_SRC:-.}:/code/
-    depends_on:
-      - base
-
   crashpad-symbolize:
     build:
       args:
@@ -461,18 +440,3 @@ services:
       context: ./docker/linux/
       dockerfile: xvfb/Dockerfile
     depends_on: [ linux-x64x11-unittest ]
-
-  linux-x64x11-integration-test:
-    <<: *build-common-definitions
-    image: cobalt-integration-test
-    build:
-      context: ./docker/linux/
-      dockerfile: integration_test/Dockerfile
-    depends_on: [ xvfb ]
-    working_dir: /code
-    environment:
-      - DISPLAY=xvfb:99
-      - IPV6_AVAILABLE=0
-      - PYTHONPATH=/code
-      - PLATFORM=${PLATFORM:-linux-x64x11}
-      - CONFIG=${CONFIG:-devel}
diff --git a/docker/linux/integration_test/Dockerfile b/docker/linux/integration_test/Dockerfile
diff --git a/docker/precommit_hooks/Dockerfile b/docker/precommit_hooks/Dockerfile
diff --git a/docker/precommit_hooks/requirements.in b/docker/precommit_hooks/requirements.in
diff --git a/docker/precommit_hooks/requirements.txt b/docker/precommit_hooks/requirements.txt
diff --git a/docker/pytest/Dockerfile b/docker/pytest/Dockerfile
diff --git a/docker/pytest/requirements.in → pytest/requirements.in b/docker/pytest/requirements.in → pytest/requirements.in
diff --git a/docker/pytest/requirements.txt → pytest/requirements.txt b/docker/pytest/requirements.txt → pytest/requirements.txt
@@ -1,12 +1,12 @@
 #
-# This file is autogenerated by pip-compile with Python 3.7
+# This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile --generate-hashes requirements.in
+#    pip-compile --allow-unsafe --generate-hashes pytest/requirements.in
 #
 atomicwrites==1.4.1 \
     --hash=sha256:81b2c9071a49367a7f770170e5eec8cb66567cfbbc8c73d20ce5ca4a8d71cf11
-    # via -r requirements.in
+    # via -r pytest/requirements.in
 attrs==23.1.0 \
     --hash=sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04 \
     --hash=sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015
@@ -143,7 +143,7 @@ coverage==6.5.0 \
     --hash=sha256:f4f05d88d9a80ad3cac6244d36dd89a3c00abc16371769f1340101d3cb899fc3 \
     --hash=sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84 \
     --hash=sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987
-    # via -r requirements.in
+    # via -r pytest/requirements.in
 exceptiongroup==1.1.3 \
     --hash=sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9 \
     --hash=sha256:343280667a4585d195ca1cf9cef84a4e178c4b6cf2274caef9859782b567d5e3
@@ -155,14 +155,6 @@ idna==3.4 \
     --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \
     --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2
     # via requests
-importlib-metadata==6.7.0 \
-    --hash=sha256:1aaf550d4f73e5d6783e7acb77aec43d49da8017410afae93822cc9cca98c4d4 \
-    --hash=sha256:cb52082e659e97afc5dac71e79de97d8681de3aa07ff18578330904a9d18e5b5
-    # via
-    #   attrs
-    #   jsonschema
-    #   pluggy
-    #   pytest
 importlib-resources==5.12.0 \
     --hash=sha256:4be82589bf5c1d7999aedf2a45159d10cb3ca4f19b2271f8792bc8e6da7b22f6 \
     --hash=sha256:7b1deeebbf351c7578e09bf2f63fa2ce8b5ffec296e0d349139d43cca061a81a
@@ -174,23 +166,23 @@ iniconfig==2.0.0 \
 jsonschema==4.17.3 \
     --hash=sha256:0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d \
     --hash=sha256:a870ad254da1a8ca84b6a2905cac29d265f805acc57af304784962a2aa6508f6
-    # via -r requirements.in
+    # via -r pytest/requirements.in
 junitparser==2.8.0 \
     --hash=sha256:a8d4290ab9fb93f2015e0dbef61ef93b7ea110e99099087a453f55c8e1481adf \
     --hash=sha256:e1a7d41e0c92ca032c46eed07a6268c478f90ec1f411ea8a76b69f245e57cfb6
-    # via -r requirements.in
+    # via -r pytest/requirements.in
 packaging==23.1 \
     --hash=sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61 \
     --hash=sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f
     # via pytest
 parameterized==0.9.0 \
     --hash=sha256:4e0758e3d41bea3bbd05ec14fc2c24736723f243b28d702081aef438c9372b1b \
     --hash=sha256:7fc905272cefa4f364c1a3429cbbe9c0f98b793988efb5bf90aac80f08db09b1
-    # via -r requirements.in
+    # via -r pytest/requirements.in
 pexpect==4.8.0 \
     --hash=sha256:0b48a55dcb3c05f3329815901ea4fc1537514d6ba867a152b581d69ae3710937 \
     --hash=sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c
-    # via -r requirements.in
+    # via -r pytest/requirements.in
 pkgutil-resolve-name==1.3.10 \
     --hash=sha256:357d6c9e6a755653cfd78893817c0853af365dd51ec97f3d358a819373bbd174 \
     --hash=sha256:ca27cc078d25c5ad71a9de0a7a330146c4e014c2462d9af19c6b828280649c5e
@@ -211,7 +203,7 @@ protobuf==4.25.1 \
     --hash=sha256:abc0525ae2689a8000837729eef7883b9391cd6aa7950249dcf5a4ede230d5dd \
     --hash=sha256:becc576b7e6b553d22cbdf418686ee4daa443d7217999125c045ad56322dda10 \
     --hash=sha256:ca37bf6a6d0046272c152eea90d2e4ef34593aaa32e8873fc14c16440f22d4b7
-    # via -r requirements.in
+    # via -r pytest/requirements.in
 ptyprocess==0.7.0 \
     --hash=sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35 \
     --hash=sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220
@@ -248,32 +240,24 @@ pyrsistent==0.19.3 \
 pytest==7.4.0 \
     --hash=sha256:78bf16451a2eb8c7a2ea98e32dc119fd2aa758f1d5d66dbf0a59d69a3969df32 \
     --hash=sha256:b4bf8c45bd59934ed84001ad51e11b4ee40d40a1229d2c79f9c592b0a3f6bd8a
-    # via -r requirements.in
+    # via -r pytest/requirements.in
 requests==2.31.0 \
     --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \
     --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1
-    # via -r requirements.in
+    # via -r pytest/requirements.in
 six==1.12.0 \
     --hash=sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c \
     --hash=sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73
-    # via -r requirements.in
+    # via -r pytest/requirements.in
 tomli==2.0.1 \
     --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
     --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f
     # via pytest
-typing-extensions==4.7.1 \
-    --hash=sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36 \
-    --hash=sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2
-    # via
-    #   importlib-metadata
-    #   jsonschema
 urllib3==2.0.4 \
     --hash=sha256:8d22f86aae8ef5e410d4f539fde9ce6b2113a001bb4d189e0aed70642d602b11 \
     --hash=sha256:de7df1803967d2c2a98e4b11bb7d6bd9210474c46e8a0401514e3a42a75ebde4
     # via requests
 zipp==3.15.0 \
     --hash=sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b \
     --hash=sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556
-    # via
-    #   importlib-metadata
-    #   importlib-resources
+    # via importlib-resources