Merge pull request #53 from mozilla-services/MZCLD-182

MZCLD-182

Author: ahoneiser

Dockerfile

@@ -104,6 +104,6 @@ COPY --chown=app:app catalog-info.yaml ./
 COPY --chown=app:app scaffolder-templates/ ./scaffolder-templates/
 
 # This switches many Node.js dependencies to production mode.
-ENV NODE_ENV production
+ENV NODE_ENV=production
 
 CMD ["node", "packages/backend", "--config", "app-config.yaml", "--config", "app-config.production.yaml"]

packages/backend/package.json

@@ -21,17 +21,17 @@
         "@backstage/plugin-app-backend": "^0.5.2",
         "@backstage/plugin-auth-backend": "^0.25.0",
         "@backstage/plugin-auth-backend-module-gcp-iap-provider": "^0.3.1",
-        "@backstage/plugin-auth-backend-module-github-provider": "^0.3.3",
+        "@backstage/plugin-auth-backend-module-github-provider": "^0.3.4",
         "@backstage/plugin-auth-backend-module-google-provider": "^0.2.1",
         "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.8",
         "@backstage/plugin-auth-node": "^0.6.3",
         "@backstage/plugin-catalog-backend": "^2.0.0",
-        "@backstage/plugin-catalog-backend-module-github": "^0.9.0",
-        "@backstage/plugin-catalog-backend-module-github-org": "^0.3.10",
+        "@backstage/plugin-catalog-backend-module-github": "^0.10.0",
+        "@backstage/plugin-catalog-backend-module-github-org": "^0.3.11",
         "@backstage/plugin-catalog-backend-module-logs": "^0.1.10",
         "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.8",
         "@backstage/plugin-events-backend": "^0.5.2",
-        "@backstage/plugin-events-backend-module-github": "^0.4.0",
+        "@backstage/plugin-events-backend-module-github": "^0.4.1",
         "@backstage/plugin-kubernetes-backend": "^0.19.6",
         "@backstage/plugin-permission-backend": "^0.7.0",
         "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.8",

packages/backend/src/index.ts

@@ -54,12 +54,24 @@ backend.add(import('@backstage/plugin-search-backend-module-techdocs'));
 // kubernetes
 backend.add(import('@backstage/plugin-kubernetes-backend'));
 
-// github
+//
+// add github auth provider plugin
+//
+backend.add(import('@backstage/plugin-auth-backend-module-github-provider'));
+
+//
+// add github discovery plugin
+//
 backend.add(import('@backstage/plugin-catalog-backend-module-github'));
+
+//
+// add github org plugin
+//
 backend.add(import('@backstage/plugin-catalog-backend-module-github-org'));
-backend.add(import('@backstage/plugin-events-backend-module-github'));
 
-// events
-backend.add(import('@backstage/plugin-events-backend'));
+//
+// add github events plugin
+//
+backend.add(import('@backstage/plugin-events-backend-module-github'));
 
 backend.start();