UPD: fix config files

Author: NewerKey

.github/workflows/ci-workflow.yaml

@@ -13,15 +13,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: ['18.x', '20.x']
+        node-version: ['20.x', '22.x']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'yarn'
@@ -44,7 +44,7 @@ jobs:
   validate_commit_messages:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Ensure full git history
@@ -73,7 +73,7 @@ jobs:
   validate_branch_names:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Validate Branch Names
         run: |
           if [ "${{ github.event_name }}" == "pull_request" ]; then

Dockerfile

@@ -1,39 +1,63 @@
 # Stage 1 - Create yarn install skeleton layer
 FROM node:20-bookworm-slim AS packages
 
+# Enable Corepack (for Yarn management) and install the required Yarn version
+RUN corepack enable 
+
 WORKDIR /app
-COPY package.json yarn.lock ./
+COPY backstage.json package.json yarn.lock ./
+COPY .yarn ./.yarn
+COPY .yarnrc.yml ./
+
 
 COPY packages packages
 
 # Comment this out if you don't have any internal plugins
-# COPY plugins plugins
+COPY plugins plugins
 
 RUN find packages \! -name "package.json" -mindepth 2 -maxdepth 2 -exec rm -rf {} \+
 
 # Stage 2 - Install dependencies and build packages
 FROM node:20-bookworm-slim AS build
 
+# Set Python interpreter for `node-gyp` to use
+ENV PYTHON=/usr/bin/python3
+
 # Install isolate-vm dependencies, these are needed by the @backstage/plugin-scaffolder-backend.
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
     apt-get update && \
     apt-get install -y --no-install-recommends python3 g++ build-essential && \
-    yarn config set python /usr/bin/python3
+    rm -rf /var/lib/apt/lists/*
+
+# Enable Corepack (for Yarn management) and install the required Yarn version
+RUN corepack enable 
 
 USER node
+
+ENV DOCKER_BUILDKIT=1
+
 WORKDIR /app
 
 COPY --from=packages --chown=node:node /app .
+COPY --from=packages --chown=node:node /app/.yarn ./.yarn
+COPY --from=packages --chown=node:node /app/.yarnrc.yml  ./
+COPY --from=packages --chown=node:node /app/backstage.json ./
 
+# Pre-create and fix ownership for cache directory
+RUN mkdir -p /home/node/.cache/node/corepack/v1 && \
+    chown -R node:node /home/node/.cache
+
+#ENV CYPRESS_INSTALL_BINARY=0
+#RUN yarn install --immutable --network-timeout 600000
 RUN --mount=type=cache,target=/home/node/.cache/yarn,sharing=locked,uid=1000,gid=1000 \
-    yarn install --frozen-lockfile --network-timeout 600000
+    yarn install --immutable
 
 COPY --chown=node:node . .
 
-RUN ls
+#RUN ls
 
-RUN ls /app
+#RUN ls /app
 
 RUN yarn tsc
 RUN yarn --cwd packages/backend build
@@ -47,16 +71,25 @@ RUN mkdir packages/backend/dist/skeleton packages/backend/dist/bundle \
 # Stage 3 - Build the actual backend image and install production dependencies
 FROM node:20-bookworm-slim
 
+# Enable Corepack (for Yarn management) and install the required Yarn version
+RUN corepack enable 
+
+# Set Python interpreter for `node-gyp` to use
+ENV PYTHON=/usr/bin/python3
+
 # Install isolate-vm dependencies, these are needed by the @backstage/plugin-scaffolder-backend.
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
     apt-get update && \
     apt-get install -y --no-install-recommends python3 g++ build-essential && \
-    yarn config set python /usr/bin/python3
+    rm -rf /var/lib/apt/lists/*
+
 
 # From here on we use the least-privileged `node` user to run the backend.
 USER node
 
+ENV DOCKER_BUILDKIT=1
+
 # This should create the app dir as `node`.
 # If it is instead created as `root` then the `tar` command below will
 # fail: `can't create directory 'packages/': Permission denied`.
@@ -65,22 +98,36 @@ USER node
 WORKDIR /app
 
 # Copy the install dependencies from the build stage and context
+COPY --from=build --chown=node:node /app/.yarn ./.yarn
+COPY --from=build --chown=node:node /app/.yarnrc.yml  ./
+COPY --from=build --chown=node:node /app/backstage.json ./
 COPY --from=build --chown=node:node /app/yarn.lock /app/package.json /app/packages/backend/dist/skeleton/ ./
 
+# Pre-create and fix ownership for cache directory
+RUN mkdir -p /home/node/.cache/node/corepack/v1 && \
+    chown -R node:node /home/node/.cache
+
 RUN --mount=type=cache,target=/home/node/.cache/yarn,sharing=locked,uid=1000,gid=1000 \
-    yarn install --frozen-lockfile --production --network-timeout 600000
+    yarn workspaces focus --all --production && rm -rf "$(yarn cache clean)"
 
 # Copy the built packages from the build stage
 COPY --from=build --chown=node:node /app/packages/backend/dist/bundle/ ./
 
 ARG APP_ENV
 
+
 # Copy any other files that we need at runtime, to understand how the configs work refer to the README.md
-COPY --chown=node:node app-config.yaml ./
-COPY --chown=node:node app-config.docker.yaml ./app-config.docker.yaml
-COPY --chown=node:node app-config.${APP_ENV}.yaml ./app-config.env.yaml
+COPY --chown=node:node app-config*.yaml ./
+# COPY --chown=node:node app-config.docker.yaml ./app-config.docker.yaml
+# COPY --chown=node:node app-config.${APP_ENV}.yaml ./app-config.env.yaml
+
+# This will include the examples, if you don't need these simply remove this line
+COPY --chown=node:node examples ./examples
 
 # This switches many Node.js dependencies to production mode. Important APP_ENV and NODE_ENV serve two different purposes
 ENV NODE_ENV production
 
+# This disables node snapshot for Node 20 to work with the Scaffolder
+ENV NODE_OPTIONS="--no-node-snapshot"
+
 CMD ["node", "packages/backend", "--config", "app-config.yaml", "--config", "app-config.docker.yaml", "--config", "app-config.env.yaml"]

app-config.docker.yaml

@@ -3,11 +3,4 @@ app:
 
 backend:
   baseUrl: ${BASE_URL}
-  listen: ':7007'
-
-catalog:
-  import:
-    entityFilename: catalog-info.yaml
-    pullRequestBranchName: backstage-integration
-  rules:
-    - allow: [Component, System, API, Resource, Location]
+  listen: ':7007'

app-config.yaml

@@ -63,10 +63,7 @@ auth:
       development:
         clientId: ${GOOGLE_CLIENT_ID}
         clientSecret: ${GOOGLE_CLIENT_SECRET}
-        signIn:
-          resolvers:
-            - resolver: emailLocalPartMatchingUserEntityName
-              domain: code.berlin
+
     github:
       development:
         clientId: ${GITHUB_CLIENT_ID}

catalog-info.yaml

@@ -23,7 +23,6 @@ spec:
   type: service
   owner: code_idp_team
   lifecycle: production
-
 ---
 apiVersion: backstage.io/v1alpha1
 kind: Group

docker-compose.yml

@@ -12,6 +12,11 @@ services:
       POSTGRES_USER: ${POSTGRES_USER:-postgres}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-admin}
       GITHUB_TOKEN: ${GITHUB_TOKEN}
+      GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID}
+      GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET}
+      GITHUB_CLIENT_ID: ${GITHUB_CLIENT_ID}
+      GITHUB_CLIENT_SECRET: ${GITHUB_CLIENT_SECRET}
+      GITLAB_TOKEN: ${GITLAB_TOKEN}
       BASE_URL: ${BASE_URL}
     ports:
       - 7007:7007

examples/template/content/index.js

@@ -71,4 +71,4 @@ spec:
         url: ${{ steps['publish'].output.remoteUrl }}
       - title: Open in catalog
         icon: catalog
-        entityRef: ${{ steps['register'].output.entityRef }}
+        entityRef: ${{ steps['register'].output.entityRef }}

examples/template/content/package.json

@@ -41,7 +41,6 @@
     "@backstage/plugin-techdocs-react": "^1.2.11",
     "@backstage/plugin-user-settings": "^0.8.16",
     "@backstage/theme": "^0.6.2",
-    "@circleci/backstage-plugin": "^0.1.1",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
     "@material-ui/core": "^4.12.2",
@@ -63,7 +62,6 @@
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.0.0",
     "@types/react-dom": "*",
-    "cross-env": "^7.0.0",
     "jest-canvas-mock": "^2.5.2"
   },
   "browserslist": {