Skip to content

Commit 29cd5ba

Browse files
Remove oss-fuzz/worker and oss-fuzz/host images. (#5094)
They are supporting a model that no longer exists.
1 parent d07a67b commit 29cd5ba

15 files changed

+5
-282
lines changed

docker/README.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ graph TD
7575
7676
subgraph OSS-Fuzz
7777
H(oss-fuzz/base)
78-
N(oss-fuzz/worker)
79-
O(oss-fuzz/host)
8078
P(oss-fuzz/host-high-end)
8179
end
8280
@@ -103,8 +101,5 @@ graph TD
103101
F --> L;
104102
F --> M;
105103
106-
H --> N;
107-
H --> O;
108-
109-
O --> P;
104+
H --> P;
110105
```

docker/build.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ IMAGES=(
2222
gcr.io/clusterfuzz-images/chromium/tester
2323
gcr.io/clusterfuzz-images/chromium/tests-syncer
2424
gcr.io/clusterfuzz-images/oss-fuzz/base
25-
gcr.io/clusterfuzz-images/oss-fuzz/host
2625
gcr.io/clusterfuzz-images/oss-fuzz/host-high-end
27-
gcr.io/clusterfuzz-images/oss-fuzz/worker
2826
gcr.io/clusterfuzz-images/ci
2927
gcr.io/clusterfuzz-images/utask-main-scheduler
3028
gcr.io/clusterfuzz-images/tworker

docker/oss-fuzz/host-high-end/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ The package lists for all three images are identical to their respective base im
2121

2222
## Dockerfile Analysis
2323

24-
The `oss-fuzz-host-high-end` Dockerfile is a minimal "wrapper" image. Its only purpose is to inherit from a `clusterfuzz/oss-fuzz/host` image and set a few environment variables. It does not install any packages or perform any configurations itself.
24+
The `oss-fuzz-host-high-end` Dockerfile is a minimal "wrapper" image. Its only purpose is to inherit from a `clusterfuzz/oss-fuzz/base` image and set a few environment variables. It does not install any packages or perform any configurations itself.
2525

2626
Because of this simplicity, the only change required to upgrade from `latest`/`ubuntu20` to `ubuntu24` is updating the `FROM` instruction to point to the corresponding `ubuntu24-04` tag of the host image. All package differences are inherited directly from this base image change.

docker/oss-fuzz/host-high-end/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
FROM gcr.io/clusterfuzz-images/oss-fuzz/host
14+
FROM gcr.io/clusterfuzz-images/oss-fuzz/base
1515

1616
# Run less instances of ClusterFuzz on these so that each instance has more
1717
# resoures.

docker/oss-fuzz/host-high-end/ubuntu-20-04.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
FROM gcr.io/clusterfuzz-images/oss-fuzz/host:ubuntu-20-04
14+
FROM gcr.io/clusterfuzz-images/oss-fuzz/base:ubuntu-20-04
1515

1616
# Run less instances of ClusterFuzz on these so that each instance has more
1717
# resoures.

docker/oss-fuzz/host-high-end/ubuntu-24-04.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
FROM gcr.io/clusterfuzz-images/oss-fuzz/host:ubuntu-24-04
14+
FROM gcr.io/clusterfuzz-images/oss-fuzz/base:ubuntu-24-04
1515

1616
# Run less instances of ClusterFuzz on these so that each instance has more
1717
# resoures.

docker/oss-fuzz/host/CHANGELOG.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

docker/oss-fuzz/host/Dockerfile

Lines changed: 0 additions & 23 deletions
This file was deleted.

docker/oss-fuzz/host/start_host.py

Lines changed: 0 additions & 91 deletions
This file was deleted.

docker/oss-fuzz/host/ubuntu-20-04.Dockerfile

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)