Merge pull request #524 from ducktors/remove-package-json-import

fix: remove package.json import on status page
ducktors · Feb 20, 2025 · ff703e7 · ff703e7
2 parents 25b8a8d + db254b2
commit ff703e7
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -90,7 +90,6 @@ jobs:
         uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
         with:
           egress-policy: audit
-
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         name: Checkout
       - name: Use Node.js
@@ -107,3 +106,35 @@ jobs:
         run: pnpm lint
       - name: Build
         run: pnpm build
+
+  docker:
+    name: Test Docker Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
+        with:
+          egress-policy: audit
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: Dockerfile
+          push: false
+          load: true
+          tags: turborepo-remote-cache:test
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+      - name: Test Docker image
+        run: |
+          docker image ls
+          docker inspect turborepo-remote-cache:test
+
+  
+
+
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -5,11 +5,13 @@ on:
     types: [published]
   workflow_dispatch:
 
-permissions: read-all
+permissions:
+  contents: read
+  packages: write
 
 jobs:
-  docker-build:
-    name: Docker Build
+  docker-hub:
+    name: Docker Hub
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
@@ -36,7 +38,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
+      - name: Build and push to Docker Hub
         uses: docker/build-push-action@v6
         with:
           context: .
@@ -45,10 +47,46 @@ jobs:
           push: true
           tags: |
             ducktors/turborepo-remote-cache:${{ steps.package-version.outputs.current-version}}
-          cache-from: |
-            type=gha
-          cache-to: |
-            type=gha,mode=max
-            
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+  github-registry:
+    name: GitHub Container Registry
+    runs-on: ubuntu-latest
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
+        with:
+          egress-policy: audit
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Get package version
+        id: package-version
+        uses: martinbeentjes/npm-get-version-action@3cf273023a0dda27efcd3164bdfb51908dd46a5b # main
+        with:
+          path: .
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3.4.0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push to GitHub Registry
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          file: Dockerfile
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository }}/turborepo-remote-cache:${{ steps.package-version.outputs.current-version}}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+
 
 
diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx commitlint --edit "$1"
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 pnpm test && pnpm build
diff --git a/package.json b/package.json
@@ -99,7 +99,7 @@
   "homepage": "https://github.com/ducktors/turborepo-remote-cache#readme",
   "engines": {
     "node": ">=20.0.0",
-    "pnpm": ">=9.15.5"
+    "pnpm": ">=9.15.4"
   },
   "keywords": [
     "turborepo",

diff --git a/src/plugins/remote-cache/routes/get-status.ts b/src/plugins/remote-cache/routes/get-status.ts
@@ -1,7 +1,4 @@
-import { readFileSync } from 'fs'
 import type { Server } from 'http'
-import { dirname, join } from 'path'
-import { fileURLToPath } from 'url'
 import type {
   RawReplyDefaultExpression,
   RawRequestDefaultExpression,
@@ -10,13 +7,6 @@ import type {
 import { type Params, type Querystring } from './schema.js'
 import { statusRouteSchema } from './status-schema.js'
 
-// Get package.json version
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = dirname(__filename)
-const packageJson = JSON.parse(
-  readFileSync(join(__dirname, '../../../../package.json'), 'utf8'),
-)
-
 export const getStatus: RouteOptions<
   Server,
   RawRequestDefaultExpression,
@@ -34,7 +24,7 @@ export const getStatus: RouteOptions<
   async handler(req, reply) {
     reply.send({
       status: 'enabled',
-      version: packageJson.version,
+      version: process.env.npm_package_version ?? 'unknown',
     })
   },
 }