chore: refactor to simplify usage with single docker image

Author: mathio

.github/workflows/docker.yml

@@ -24,19 +24,11 @@ jobs:
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      # - name: Build BitBucket image and push
-      #   uses: docker/build-push-action@v6
-      #   with:
-      #     push: true
-      #     platforms: linux/amd64
-      #     context: ./action
-      #     file: ./action/Dockerfile-bitbucket
-      #     tags: ${{ secrets.DOCKERHUB_USERNAME }}/bitbucket:latest
-      - name: Build Gitlab image and push
+      - name: Build BitBucket image and push
         uses: docker/build-push-action@v6
         with:
           push: true
           platforms: linux/amd64
           context: ./action
-          file: ./action/Dockerfile-gitlab
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/gitlab:v8
+          file: ./action/Dockerfile
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/ci:v11

action/Dockerfile

@@ -19,4 +19,4 @@ RUN npm install -g pnpm && pnpm install
 RUN pnpm build
 
 # Run the Node.js / TypeScript application
-ENTRYPOINT ["node", "/app/build/github.js"]
+ENTRYPOINT ["node", "/app/build/index.js"]

action/Dockerfile-bitbucket

@@ -17,6 +17,9 @@ export class InBranchFlow extends IntegrationFlow {
     const hasChanges = this.checkCommitableChanges();
     this.ora.succeed(hasChanges ? "Changes detected" : "No changes detected");
 
+    execSync(`git status`, { stdio: "inherit" });
+    execSync(`git branch`, { stdio: "inherit" });
+
     if (hasChanges) {
       this.ora.start("Committing changes");
       execSync(`git add .`, { stdio: "inherit" });
@@ -26,7 +29,10 @@ export class InBranchFlow extends IntegrationFlow {
       this.ora.succeed("Changes committed");
 
       this.ora.start("Pushing changes to remote");
-      execSync(`git push origin HEAD --force`, { stdio: "inherit" });
+      execSync(
+        `git push origin ${this.platformKit.platformConfig.baseBranchName} --force`,
+        { stdio: "inherit" },
+      );
       this.ora.succeed("Changes pushed to remote");
     }
 

action/Dockerfile-gitlab

@@ -3,10 +3,11 @@ import createOra from "ora";
 import { IIntegrationFlow } from "./flows/_base.js";
 import { PullRequestFlow } from "./flows/pull-request.js";
 import { InBranchFlow } from "./flows/in-branch.js";
-import { PlatformKit } from "./platforms/_base.js";
+import { getPlatformKit } from "./platforms/index.js";
 
-export async function entrypoint(platformKit: PlatformKit) {
+(async function main() {
   const ora = createOra();
+  const platformKit = getPlatformKit();
   const { isPullRequestMode } = platformKit.config;
 
   ora.info(`Pull request mode: ${isPullRequestMode ? "on" : "off"}`);
@@ -20,4 +21,4 @@ export async function entrypoint(platformKit: PlatformKit) {
   if (hasChanges) {
     await flow.postRun?.();
   }
-}
+})();