fixes

Author: Judahmeek

.controlplane/Dockerfile

@@ -46,11 +46,6 @@ RUN yarn install --frozen-lockfile
 # Copy application code
 COPY . .
 
-RUN echo "ZYXYZYXYZ"
-
-RUN ls -l
-RUN ls -l app
-
 # Final stage for app image
 FROM base
 
@@ -63,10 +58,6 @@ RUN apt-get update -qq && \
 COPY --from=build /usr/local/bundle /usr/local/bundle
 COPY --from=build /app /app
 
-RUN ls -l app
-
-RUN cat /app/client/app/bundles/comments/components/Footer/Footer.jsx
-
 RUN chmod +x /app/.controlplane/*.sh
 
 ENV RAILS_ENV=production \

.github/actions/build-docker-image/action.yml

@@ -28,8 +28,6 @@ runs:
         fi
         
         echo "🏗️ Building Docker image${PR_INFO} (commit ${{ inputs.commit }})..."
-
-        /usr/bin/git log -1 --format=%H
         
         if cpflow build-image -a "${{ inputs.app_name }}" --commit="${{ inputs.commit }}" --org="${{ inputs.org }}"; then
           image_tag="${{ inputs.org }}/${{ inputs.app_name }}:${{ inputs.commit }}"

.github/workflows/deploy-to-control-plane-staging.yml

@@ -5,10 +5,21 @@ run-name: Deploy Control Plane Staging App
 
 # Controls when the workflow will run
 on:
+  pull_request:
+    types: [opened, synchronize, reopened]
   push:
     branches:
-      - '*'
+      - '**'        # Any branch
+      - '!main'     # Except main
+      - '!master'   # Except master
+  issue_comment:
+    types: [created]
   workflow_dispatch:
+    inputs:
+      pr_number:
+        description: 'Pull Request number to deploy'
+        required: true
+        type: number
 
 # Convert the GitHub secret variables to environment variables for use by the Control Plane CLI
 env:

.github/workflows/nightly-remove-stale-review-apps.yml

@@ -6,10 +6,6 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
-env:
-  CPLN_ORG: ${{secrets.CPLN_ORG_STAGING}}
-  CPLN_TOKEN: ${{secrets.CPLN_TOKEN_STAGING}}
-
 jobs:
   remove-stale-review-apps:
     runs-on: ubuntu-latest
@@ -20,6 +16,9 @@ jobs:
 
       - name: Setup Environment
         uses: ./.github/actions/setup-environment
+        with:
+          token: ${{ secrets.CPLN_TOKEN_STAGING }}
+          org: ${{ vars.CPLN_ORG_STAGING }}
 
       - name: Get Stale PRs
         id: stale_prs