Merge pull request #4789 from backstage/timbonicus/docker-tweaks

Update documentation, remove CircleCI from default app

packages/create-app/package.json

@@ -56,7 +56,6 @@
     "@backstage/plugin-catalog": "*",
     "@backstage/plugin-catalog-backend": "*",
     "@backstage/plugin-catalog-import": "*",
-    "@backstage/plugin-circleci": "*",
     "@backstage/plugin-explore": "*",
     "@backstage/plugin-github-actions": "*",
     "@backstage/plugin-lighthouse": "*",

packages/create-app/templates/default-app/packages/app/package.json.hbs

@@ -15,7 +15,6 @@
     "@backstage/plugin-scaffolder": "^{{version '@backstage/plugin-scaffolder'}}",
     "@backstage/plugin-techdocs": "^{{version '@backstage/plugin-techdocs'}}",
     "@backstage/catalog-model": "^{{version '@backstage/catalog-model'}}",
-    "@backstage/plugin-circleci": "^{{version '@backstage/plugin-circleci'}}",
     "@backstage/plugin-tech-radar": "^{{version '@backstage/plugin-tech-radar'}}",
     "@backstage/plugin-github-actions": "^{{version '@backstage/plugin-github-actions'}}",
     "@backstage/plugin-user-settings": "^{{version '@backstage/plugin-user-settings'}}",

packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx

@@ -17,9 +17,9 @@ import { ApiEntity, Entity } from '@backstage/catalog-model';
 import { WarningPanel } from '@backstage/core';
 import {
   ApiDefinitionCard,
-  ConsumedApisCard, 
-  ConsumingComponentsCard, 
-  ProvidedApisCard, 
+  ConsumedApisCard,
+  ConsumingComponentsCard,
+  ProvidedApisCard,
   ProvidingComponentsCard
 } from '@backstage/plugin-api-docs';
 import {
@@ -28,9 +28,6 @@ import {
 import {
   useEntity
 } from '@backstage/plugin-catalog-react';
-import {
-  isPluginApplicableToEntity as isCircleCIAvailable, Router as CircleCIRouter
-} from '@backstage/plugin-circleci';
 import {
   isPluginApplicableToEntity as isGitHubActionsAvailable, Router as GitHubActionsRouter
 } from '@backstage/plugin-github-actions';
@@ -45,8 +42,6 @@ const CICDSwitcher = ({ entity }: { entity: Entity }) => {
   switch (true) {
     case isGitHubActionsAvailable(entity):
       return <GitHubActionsRouter entity={entity} />;
-    case isCircleCIAvailable(entity):
-      return <CircleCIRouter entity={entity} />;
     default:
       return (
         <WarningPanel title="CI/CD switcher:">

packages/create-app/templates/default-app/packages/app/src/plugins.ts

@@ -1,7 +1,6 @@
 export { plugin as ApiDocs } from '@backstage/plugin-api-docs';
 export { plugin as CatalogPlugin } from '@backstage/plugin-catalog';
 export { plugin as CatalogImport } from '@backstage/plugin-catalog-import';
-export { plugin as Circleci } from '@backstage/plugin-circleci';
 export { plugin as GithubActions } from '@backstage/plugin-github-actions';
 export { plugin as ScaffolderPlugin } from '@backstage/plugin-scaffolder';
 export { plugin as TechDocsPlugin } from '@backstage/plugin-techdocs';