Revert "Use Red Hat subscription in RHEL image (#433)" (#434)

This reverts commit 49cd10a.

Author: connorgorman

.circleci/config.yml

@@ -809,9 +809,7 @@ workflows:
             - upload-dumps-for-embedding-into-image
       - build-rhel:
           <<: *runOnAllTags
-          context:
-            - docker-io-and-stackrox-io-push
-            - redhat-developer-account-login
+          context: docker-io-and-stackrox-io-push
           requires:
             - create-postgres-dump-from-genesis-dump
             - upload-dumps-for-embedding-into-image
@@ -871,9 +869,7 @@ workflows:
           - upload-dumps-for-embedding-into-image
     - build-rhel:
         <<: *runOnAllTags
-        context:
-          - docker-io-and-stackrox-io-push
-          - redhat-developer-account-login
+        context: docker-io-and-stackrox-io-push
         requires:
           - create-postgres-dump-from-genesis-dump
           - upload-dumps-for-embedding-into-image

Makefile

@@ -177,7 +177,7 @@ $(CURDIR)/image/db/rhel/bundle.tar.gz:
 .PHONY: scanner-image-rhel
 scanner-image-rhel: scanner-rhel-build-dockerized $(CURDIR)/image/scanner/rhel/bundle.tar.gz
 	@echo "+ $@"
-	@docker build --build-arg REDHAT_USERNAME="${REDHAT_USERNAME}" --build-arg REDHAT_PASSWORD="${REDHAT_PASSWORD}" -t us.gcr.io/stackrox-ci/scanner-rhel:$(TAG) -f image/scanner/rhel/Dockerfile image/scanner/rhel
+	@docker build -t us.gcr.io/stackrox-ci/scanner-rhel:$(TAG) -f image/scanner/rhel/Dockerfile image/scanner/rhel
 
 .PHONY: db-image
 db-image:
@@ -191,7 +191,7 @@ db-image:
 db-image-rhel: $(CURDIR)/image/db/rhel/bundle.tar.gz
 	@echo "+ $@"
 	@test -f image/db/dump/definitions.sql.gz || { echo "FATAL: No definitions dump found in image/dump/definitions.sql.gz. Exiting..."; exit 1; }
-	@docker build --build-arg REDHAT_USERNAME="${REDHAT_USERNAME}" --build-arg REDHAT_PASSWORD="${REDHAT_PASSWORD}" -t us.gcr.io/stackrox-ci/scanner-db-rhel:$(TAG) -f image/db/rhel/Dockerfile image/db/rhel
+	@docker build -t us.gcr.io/stackrox-ci/scanner-db-rhel:$(TAG) -f image/db/rhel/Dockerfile image/db/rhel
 
 .PHONY: deploy
 deploy: clean-helm-rendered

image/db/rhel/Dockerfile

@@ -1,6 +1,6 @@
 ARG BASE_REGISTRY=registry.access.redhat.com
 ARG BASE_IMAGE=ubi8/ubi
-ARG BASE_TAG=8.4
+ARG BASE_TAG=8.3
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS extracted_bundle
 COPY bundle.tar.gz /
@@ -10,9 +10,6 @@ RUN tar -xzf /bundle.tar.gz
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-ARG REDHAT_USERNAME
-ARG REDHAT_PASSWORD
-
 LABEL name="scanner-db-rhel" \
       vendor="StackRox" \
       maintainer="[email protected]" \
@@ -30,9 +27,7 @@ COPY --from=extracted_bundle /bundle/postgres.rpm /bundle/postgres-libs.rpm /bun
 COPY --from=extracted_bundle /bundle/etc/postgresql.conf /bundle/etc/pg_hba.conf /etc/
 COPY --from=extracted_bundle /bundle/docker-entrypoint-initdb.d/definitions.sql.gz /docker-entrypoint-initdb.d/
 
-RUN subscription-manager register --username "${REDHAT_USERNAME}" --password "${REDHAT_PASSWORD}" && \
-    subscription-manager attach && \
-    groupadd -g 70 postgres && \
+RUN groupadd -g 70 postgres && \
     adduser postgres -u 70 -g 70 -d /var/lib/postgresql -s /bin/sh && \
     rpm --import RPM-GPG-KEY-PGDG-12 && \
     dnf upgrade -y && \

image/scanner/rhel/Dockerfile

@@ -1,6 +1,6 @@
 ARG BASE_REGISTRY=registry.access.redhat.com
 ARG BASE_IMAGE=ubi8/ubi
-ARG BASE_TAG=8.4
+ARG BASE_TAG=8.3
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS extracted_bundle
 
@@ -10,9 +10,6 @@ RUN tar -xzf /bundle.tar.gz
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-ARG REDHAT_USERNAME
-ARG REDHAT_PASSWORD
-
 LABEL name="scanner-rhel" \
       vendor="StackRox" \
       maintainer="[email protected]" \
@@ -32,9 +29,7 @@ COPY --from=extracted_bundle "/bundle${NVD_DEFINITIONS_DIR}/" ".${NVD_DEFINITION
 COPY --from=extracted_bundle "/bundle${K8S_DEFINITIONS_DIR}/" ".${K8S_DEFINITIONS_DIR}/"
 COPY --from=extracted_bundle "/bundle${REPO_TO_CPE_DIR}/" ".${REPO_TO_CPE_DIR}/"
 
-RUN subscription-manager register --username "${REDHAT_USERNAME}" --password "${REDHAT_PASSWORD}" && \
-    subscription-manager attach && \
-    dnf upgrade -y && \
+RUN dnf upgrade -y && \
     dnf install -y ca-certificates xz && \
     dnf clean all && \
     rm -rf /var/cache/dnf && \