Merge pull request 'fix: use REGISTRY and GIT_REMOTE vars, point to git2.lunarfront.tech' (#2) from fix/ci-only-on-pr into main

Reviewed-on: https://git2.lunarfront.tech/ryan/lunarfront-app/pulls/2

.dockerignore

@@ -6,6 +6,7 @@ planning
 deploy
 infra
 packages/admin
+!packages/admin/package.json
 Dockerfile*
 docker-compose*
 *.md

.gitea/workflows/build.yml

@@ -5,10 +5,17 @@ on:
     branches: [main]
   workflow_dispatch:
 
+concurrency:
+  group: build
+  cancel-in-progress: false
+
 jobs:
   build:
     runs-on: ubuntu-latest
     if: "!startsWith(github.event.head_commit.message, 'chore: bump version')"
+    env:
+      REGISTRY: git2.lunarfront.tech
+      GIT_REMOTE: git2.lunarfront.tech
 
     steps:
       - name: Checkout
@@ -45,27 +52,8 @@ jobs:
           ")
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
-      - name: Commit version bump
-        run: |
-          git config user.name "lunarfront-bot"
-          git config user.email "bot@lunarfront.tech"
-          git remote set-url origin https://lunarfront-bot:${{ secrets.BOT_TOKEN }}@git.lunarfront.tech/ryan/lunarfront-app.git
-          git add packages/backend/package.json
-          git commit -m "chore: bump version to v${{ steps.version.outputs.version }}"
-          git push origin main
-
-      - name: Install Docker CLI
-        run: |
-          apt-get update -qq
-          apt-get install -y ca-certificates curl
-          install -m 0755 -d /etc/apt/keyrings
-          curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
-          echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(. /etc/os-release && echo $VERSION_CODENAME) stable" > /etc/apt/sources.list.d/docker.list
-          apt-get update -qq
-          apt-get install -y docker-ce-cli
-
       - name: Login to registry
-        run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login registry.lunarfront.tech -u ryan --password-stdin
+        run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login $REGISTRY -u ryan --password-stdin
 
       - name: Build and push backend
         run: |
@@ -73,27 +61,37 @@ jobs:
           SHA=$(git rev-parse --short HEAD)
           docker build \
             --build-arg APP_VERSION=$VERSION \
-            -t registry.lunarfront.tech/ryan/lunarfront-app:$VERSION \
-            -t registry.lunarfront.tech/ryan/lunarfront-app:$SHA \
-            -t registry.lunarfront.tech/ryan/lunarfront-app:latest \
+            -t $REGISTRY/ryan/lunarfront-app:$VERSION \
+            -t $REGISTRY/ryan/lunarfront-app:$SHA \
+            -t $REGISTRY/ryan/lunarfront-app:latest \
             -f Dockerfile .
-          docker push registry.lunarfront.tech/ryan/lunarfront-app:$VERSION
-          docker push registry.lunarfront.tech/ryan/lunarfront-app:$SHA
-          docker push registry.lunarfront.tech/ryan/lunarfront-app:latest
+          docker push $REGISTRY/ryan/lunarfront-app:$VERSION
+          docker push $REGISTRY/ryan/lunarfront-app:$SHA
+          docker push $REGISTRY/ryan/lunarfront-app:latest
 
       - name: Build and push frontend
         run: |
           VERSION=${{ steps.version.outputs.version }}
           SHA=$(git rev-parse --short HEAD)
           docker build \
-            -t registry.lunarfront.tech/ryan/lunarfront-frontend:$VERSION \
-            -t registry.lunarfront.tech/ryan/lunarfront-frontend:$SHA \
-            -t registry.lunarfront.tech/ryan/lunarfront-frontend:latest \
+            -t $REGISTRY/ryan/lunarfront-frontend:$VERSION \
+            -t $REGISTRY/ryan/lunarfront-frontend:$SHA \
+            -t $REGISTRY/ryan/lunarfront-frontend:latest \
             -f Dockerfile.frontend .
-          docker push registry.lunarfront.tech/ryan/lunarfront-frontend:$VERSION
-          docker push registry.lunarfront.tech/ryan/lunarfront-frontend:$SHA
-          docker push registry.lunarfront.tech/ryan/lunarfront-frontend:latest
+          docker push $REGISTRY/ryan/lunarfront-frontend:$VERSION
+          docker push $REGISTRY/ryan/lunarfront-frontend:$SHA
+          docker push $REGISTRY/ryan/lunarfront-frontend:latest
+
+      - name: Commit version bump
+        run: |
+          git config user.name "lunarfront-bot"
+          git config user.email "bot@lunarfront.tech"
+          git remote set-url origin https://lunarfront-bot:${{ secrets.BOT_TOKEN }}@$GIT_REMOTE/ryan/lunarfront-app.git
+          git add packages/backend/package.json
+          git commit -m "chore: bump version to v${{ steps.version.outputs.version }}"
+          git pull --rebase origin main
+          git push origin main
 
       - name: Logout
         if: always()
-        run: docker logout registry.lunarfront.tech
+        run: docker logout $REGISTRY

.gitea/workflows/ci.yml

@@ -1,8 +1,6 @@
 name: CI
 
 on:
-  push:
-    branches: [main]
   pull_request:
     branches: [main]
   workflow_dispatch:
@@ -32,6 +30,8 @@ jobs:
   e2e:
     runs-on: ubuntu-latest
     needs: ci
+    env:
+      DOCKER_HOST: tcp://localhost:2375
 
     steps:
       - name: Checkout

Dockerfile

@@ -3,6 +3,7 @@ WORKDIR /app
 COPY package.json bun.lock ./
 COPY packages/shared/package.json packages/shared/
 COPY packages/backend/package.json packages/backend/
+COPY packages/admin/package.json packages/admin/
 RUN bun install --frozen-lockfile
 
 FROM oven/bun:1.3.11-alpine AS build

Dockerfile.frontend

@@ -3,6 +3,7 @@ WORKDIR /app
 COPY package.json bun.lock ./
 COPY packages/shared/package.json packages/shared/
 COPY packages/admin/package.json packages/admin/
+COPY packages/backend/package.json packages/backend/
 RUN bun install --frozen-lockfile
 
 FROM oven/bun:1.3.11-alpine AS build

Dockerfile.frontend.dockerignore

@@ -6,6 +6,7 @@ planning
 deploy
 infra
 packages/backend
+!packages/backend/package.json
 Dockerfile*
 docker-compose*
 *.md

packages/backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunarfront/backend",
-  "version": "0.0.1",
+  "version": "0.0.25",
   "private": true,
   "type": "module",
   "scripts": {