Skip to content

Commit f3b8b35

Browse files
authored
ROX-18384: remove slim images from upstream (#1963)
Removes unused -base and -latest tags too
1 parent ff31248 commit f3b8b35

File tree

4 files changed

+4
-143
lines changed

4 files changed

+4
-143
lines changed

.github/workflows/collector.yml

Lines changed: 1 addition & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -190,27 +190,6 @@ jobs:
190190
base-image: quay.io/stackrox-io/collector:${{ inputs.collector-tag }}
191191
archs: ${{ env.ARCHS }}
192192

193-
- name: Create and push multiarch manifest for stackrox-io -slim
194-
uses: ./.github/actions/create-multiarch-manifest
195-
with:
196-
base-image: quay.io/stackrox-io/collector:${{ inputs.collector-tag }}
197-
archs: ${{ env.ARCHS }}
198-
suffix: -slim
199-
200-
- name: Create and push multiarch manifest for stackrox-io -base
201-
uses: ./.github/actions/create-multiarch-manifest
202-
with:
203-
base-image: quay.io/stackrox-io/collector:${{ inputs.collector-tag }}
204-
archs: ${{ env.ARCHS }}
205-
suffix: -base
206-
207-
- name: Create and push multiarch manifest for stackrox-io -latest
208-
uses: ./.github/actions/create-multiarch-manifest
209-
with:
210-
base-image: quay.io/stackrox-io/collector:${{ inputs.collector-tag }}
211-
archs: ${{ env.ARCHS }}
212-
suffix: -latest
213-
214193
- name: Login to quay.io/rhacs-eng
215194
uses: docker/login-action@v3
216195
with:
@@ -224,31 +203,10 @@ jobs:
224203
base-image: quay.io/rhacs-eng/collector:${{ inputs.collector-tag }}
225204
archs: ${{ env.ARCHS }}
226205

227-
- name: Create and push multiarch manifest for rhacs-eng -slim
228-
uses: ./.github/actions/create-multiarch-manifest
229-
with:
230-
base-image: quay.io/rhacs-eng/collector:${{ inputs.collector-tag }}
231-
archs: ${{ env.ARCHS }}
232-
suffix: -slim
233-
234-
- name: Create and push multiarch manifest for rhacs-eng -base
235-
uses: ./.github/actions/create-multiarch-manifest
236-
with:
237-
base-image: quay.io/rhacs-eng/collector:${{ inputs.collector-tag }}
238-
archs: ${{ env.ARCHS }}
239-
suffix: -base
240-
241-
- name: Create and push multiarch manifest for rhacs-eng -latest
242-
uses: ./.github/actions/create-multiarch-manifest
243-
with:
244-
base-image: quay.io/rhacs-eng/collector:${{ inputs.collector-tag }}
245-
archs: ${{ env.ARCHS }}
246-
suffix: -latest
247-
248206
retag-x86-image:
249207
needs:
250208
- build-collector-image
251-
name: Retag x86 slim image
209+
name: Retag x86 image
252210
runs-on: ubuntu-24.04
253211
if: |
254212
github.event_name == 'pull_request' &&
@@ -266,30 +224,6 @@ jobs:
266224
username: ${{ secrets.QUAY_STACKROX_IO_RW_USERNAME }}
267225
password: ${{ secrets.QUAY_STACKROX_IO_RW_PASSWORD }}
268226

269-
- name: Retag and push stackrox-io -slim
270-
uses: stackrox/actions/images/retag-and-push@v1
271-
with:
272-
src-image: ${{ inputs.collector-image }}-amd64
273-
dst-image: ${{ inputs.collector-image }}-slim
274-
username: ${{ secrets.QUAY_STACKROX_IO_RW_USERNAME }}
275-
password: ${{ secrets.QUAY_STACKROX_IO_RW_PASSWORD }}
276-
277-
- name: Retag and push stackrox-io -base
278-
uses: stackrox/actions/images/retag-and-push@v1
279-
with:
280-
src-image: ${{ inputs.collector-image }}-amd64
281-
dst-image: ${{ inputs.collector-image }}-base
282-
username: ${{ secrets.QUAY_STACKROX_IO_RW_USERNAME }}
283-
password: ${{ secrets.QUAY_STACKROX_IO_RW_PASSWORD }}
284-
285-
- name: Retag and push stackrox-io -latest
286-
uses: stackrox/actions/images/retag-and-push@v1
287-
with:
288-
src-image: ${{ inputs.collector-image }}-amd64
289-
dst-image: ${{ inputs.collector-image }}-latest
290-
username: ${{ secrets.QUAY_STACKROX_IO_RW_USERNAME }}
291-
password: ${{ secrets.QUAY_STACKROX_IO_RW_PASSWORD }}
292-
293227
- name: Retag and push rhacs-eng
294228
uses: stackrox/actions/images/retag-and-push@v1
295229
with:
@@ -298,30 +232,6 @@ jobs:
298232
username: ${{ secrets.QUAY_RHACS_ENG_RW_USERNAME }}
299233
password: ${{ secrets.QUAY_RHACS_ENG_RW_PASSWORD }}
300234

301-
- name: Retag and push rhacs-eng -slim
302-
uses: stackrox/actions/images/retag-and-push@v1
303-
with:
304-
src-image: ${{ inputs.collector-image }}-amd64
305-
dst-image: ${{ env.RHACS_ENG_IMAGE }}-slim
306-
username: ${{ secrets.QUAY_RHACS_ENG_RW_USERNAME }}
307-
password: ${{ secrets.QUAY_RHACS_ENG_RW_PASSWORD }}
308-
309-
- name: Retag and push rhacs-eng -base
310-
uses: stackrox/actions/images/retag-and-push@v1
311-
with:
312-
src-image: ${{ inputs.collector-image }}-amd64
313-
dst-image: ${{ env.RHACS_ENG_IMAGE }}-base
314-
username: ${{ secrets.QUAY_RHACS_ENG_RW_USERNAME }}
315-
password: ${{ secrets.QUAY_RHACS_ENG_RW_PASSWORD }}
316-
317-
- name: Retag and push rhacs-eng -latest
318-
uses: stackrox/actions/images/retag-and-push@v1
319-
with:
320-
src-image: ${{ inputs.collector-image }}-amd64
321-
dst-image: ${{ env.RHACS_ENG_IMAGE }}-latest
322-
username: ${{ secrets.QUAY_RHACS_ENG_RW_USERNAME }}
323-
password: ${{ secrets.QUAY_RHACS_ENG_RW_PASSWORD }}
324-
325235
notify:
326236
runs-on: ubuntu-24.04
327237
if: always() && contains(join(needs.*.result, ','), 'failure') && github.event_name != 'pull_request'

ansible/README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,8 @@ quay.io.
5151

5252
### Collector image
5353

54-
The `ci-build-collector.yml` playbook is meant to be used by CI, it handles the
55-
build process for the slim collector image, as well as retagging and pushing
56-
of these images to quay.io.
54+
The `ci-build-collector.yml` playbook is meant to be used by CI, it handles
55+
retagging and pushing of Collector images to quay.io.
5756

5857
#### Environment variables used by the playbook
5958

ansible/ci-build-collector.yml

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -63,27 +63,6 @@
6363
push: true
6464
source: local
6565

66-
- name: Push slim to quay.io/stackrox-io
67-
community.docker.docker_image:
68-
name: "{{ collector_image }}-{{ arch }}"
69-
repository: "{{ collector_image }}-{{ arch }}-slim"
70-
push: true
71-
source: local
72-
73-
- name: Push base to quay.io/stackrox-io
74-
community.docker.docker_image:
75-
name: "{{ collector_image }}-{{ arch }}"
76-
repository: "{{ collector_image }}-{{ arch }}-base"
77-
push: true
78-
source: local
79-
80-
- name: Push latest to quay.io/stackrox-io
81-
community.docker.docker_image:
82-
name: "{{ collector_image }}-{{ arch }}"
83-
repository: "{{ collector_image }}-{{ arch }}-latest"
84-
push: true
85-
source: local
86-
8766
- name: Login to quay.io
8867
community.docker.docker_login:
8968
registry_url: quay.io
@@ -97,39 +76,12 @@
9776
push: true
9877
source: local
9978

100-
- name: Push slim to quay.io/rhacs-eng
101-
community.docker.docker_image:
102-
name: "{{ rhacs_eng_image }}-{{ arch }}"
103-
repository: "{{ rhacs_eng_image }}-{{ arch }}-slim"
104-
push: true
105-
source: local
106-
107-
- name: Push base to quay.io/rhacs-eng
108-
community.docker.docker_image:
109-
name: "{{ rhacs_eng_image }}-{{ arch }}"
110-
repository: "{{ rhacs_eng_image }}-{{ arch }}-base"
111-
push: true
112-
source: local
113-
114-
- name: Push latest to quay.io/rhacs-eng
115-
community.docker.docker_image:
116-
name: "{{ rhacs_eng_image }}-{{ arch }}"
117-
repository: "{{ rhacs_eng_image }}-{{ arch }}-latest"
118-
push: true
119-
source: local
120-
12179
- name: Print images pushed
12280
debug:
12381
msg:
12482
- "Pushed the following images:"
12583
- " {{ collector_image }}-{{ arch }}"
126-
- " {{ collector_image }}-{{ arch }}-slim"
127-
- " {{ collector_image }}-{{ arch }}-base"
128-
- " {{ collector_image }}-{{ arch }}-latest"
12984
- " {{ rhacs_eng_image }}-{{ arch }}"
130-
- " {{ rhacs_eng_image }}-{{ arch }}-slim"
131-
- " {{ rhacs_eng_image }}-{{ arch }}-base"
132-
- " {{ rhacs_eng_image }}-{{ arch }}-latest"
13385
tags: [print_action]
13486

13587
- name: Logout of quay.io

docs/how-to-start.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ $ make image
2525

2626
This target will build necessary submodules (gRPC dependencies, Falco
2727
libraries), prepare a builder image, compile Collector using it, and wrap
28-
everything into a slim image with Collector binary inside.
28+
everything into an image with the Collector binary inside.
2929

3030
*NOTE*: Using an intermediate image for compilation means that file paths are
3131
going to be different between your local project directory and the image. For

0 commit comments

Comments
 (0)