From 9e32a6c9fe9d5c2d4c91a03f499c2002838050ff Mon Sep 17 00:00:00 2001 From: Mauro Ezequiel Moltrasio Date: Fri, 9 Aug 2024 11:37:05 +0200 Subject: [PATCH] Remove collector image The CI image for collector used to be used on CircleCI and OSCI, but once we migrated to GHA we stopped using it, since the base VMs already have all the tools we need pre-installed in them. Removing the image so colleagues using this repo no longer need to worry about maintaining it. --- .github/workflows/build.yaml | 12 ------ Makefile | 8 ---- images/collector.Dockerfile | 82 ------------------------------------ 3 files changed, 102 deletions(-) delete mode 100644 images/collector.Dockerfile diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d40aea6a..20d64ad5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -55,18 +55,6 @@ jobs: with: image-flavor: "stackrox-ui-test" - build-and-push-collector: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/actions/build-and-push-image - with: - image-flavor: "collector" - build-and-push-scanner-build: runs-on: ubuntu-latest steps: diff --git a/Makefile b/Makefile index 2961d42b..10aed902 100644 --- a/Makefile +++ b/Makefile @@ -47,14 +47,6 @@ test-cci-export: --rm \ test-cci-export -.PHONY: collector-image -collector-image: - $(DOCKER) build \ - --platform linux/amd64 \ - -t quay.io/$(QUAY_REPO)/apollo-ci:$(shell scripts/get_tag.sh "collector") \ - -f images/collector.Dockerfile \ - images/ - .PHONY: scanner-build-image scanner-build-image: $(DOCKER) build \ diff --git a/images/collector.Dockerfile b/images/collector.Dockerfile deleted file mode 100644 index 5d610e87..00000000 --- a/images/collector.Dockerfile +++ /dev/null @@ -1,82 +0,0 @@ -FROM registry.access.redhat.com/ubi8:latest - -SHELL ["/bin/bash", "-o", "pipefail", "-c"] - -### cci-export support (and google-cloud-sdk repo) -COPY ./static-contents/ /static-tmp -RUN set -ex \ - && find /static-tmp -type f -print0 | \ - xargs -0 -I '{}' -n1 bash -c 'dir="$(dirname "${1}")"; new_dir="${dir#/static-tmp}"; mkdir -p "${new_dir}"; cp "${1}" "${new_dir}";' -- {} \ - && rm -r /static-tmp - -RUN dnf update -y && \ - dnf install -y dnf-plugins-core && \ - dnf config-manager --add-repo https://download.docker.com/linux/rhel/docker-ce.repo && \ - # This set replaces centos:stream8 "Development Tools". It is possible - # rox-ci-image does not need all of these. - dnf install -y \ - autoconf \ - automake \ - binutils \ - gcc \ - gcc-c++ \ - gdb \ - glibc-devel \ - libtool \ - make \ - pkgconf \ - pkgconf-m4 \ - pkgconf-pkg-config \ - redhat-rpm-config \ - rpm-build \ - strace \ - ctags \ - git \ - perl-Fedora-VSP \ - perl-generators \ - source-highlight && \ - dnf install -y \ - clang-tools-extra \ - cmake \ - google-cloud-cli \ - jq \ - procps-ng \ - python38 \ - wget \ - docker-ce \ - docker-ce-cli \ - docker-ce-rootless-extras \ - && \ - dnf upgrade -y && \ - dnf clean all && \ - rm -rf /var/cache/dnf /var/cache/yum - -# Symlink python to python3 -RUN ln -s /usr/bin/python3 /usr/bin/python - -# Install pip -RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py - -ARG GOLANG_VERSION=1.21.9 -ARG GOLANG_SHA256=f76194c2dc607e0df4ed2e7b825b5847cb37e34fc70d780e2f6c7e805634a7ea -ENV GOPATH /go -ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH -RUN url="https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \ - wget --no-verbose -O go.tgz "$url" && \ - echo "${GOLANG_SHA256} *go.tgz" | sha256sum -c - && \ - tar -C /usr/local -xzf go.tgz && \ - rm go.tgz && \ - mkdir -p "$GOPATH/src" "$GOPATH/bin" && \ - chmod -R 777 "$GOPATH" - -RUN \ -# Install additional formatters/linters - go install mvdan.cc/sh/v3/cmd/shfmt@v3.4.1 && \ - wget -qO- "https://github.com/koalaman/shellcheck/releases/download/stable/shellcheck-stable.linux.x86_64.tar.xz" | tar -xJv && \ - cp "shellcheck-stable/shellcheck" /usr/bin/ && \ -# Install hub-comment - wget --quiet https://github.com/joshdk/hub-comment/releases/download/0.1.0-rc6/hub-comment_linux_amd64 && \ - install hub-comment_linux_amd64 /usr/bin/hub-comment - -# Extra python dependencies for test-scripts -RUN pip3 -q install --upgrade scipy google-cloud-storage==2.2.1