Nicolas Meienberger 2 лет назад
Родитель
Сommit
7d255acdbb

+ 6 - 6
.github/workflows/release-candidate.yml

@@ -15,29 +15,29 @@ jobs:
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-      
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      
+
       - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      
+
       - name: Get tag from VERSION file
         id: meta
         run: |
           VERSION=$(npm run version --silent)
           TAG=${VERSION}
           echo "::set-output name=tag::${TAG}"
-      
+
       - name: Build and push images
         uses: docker/build-push-action@v3
         with:
           context: .
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: meienberger/runtipi:rc-${{ steps.meta.outputs.TAG }}
           cache-from: type=registry,ref=meienberger/runtipi:buildcache
-          cache-to: type=registry,ref=meienberger/runtipi:buildcache,mode=max
+          cache-to: type=registry,ref=meienberger/runtipi:buildcache,mode=max

+ 7 - 8
.github/workflows/release.yml

@@ -1,10 +1,9 @@
-
 name: Publish release
 on:
   push:
-    branches:    
+    branches:
       - master
-      
+
 jobs:
   release:
     if: github.repository == 'meienberger/runtipi'
@@ -18,25 +17,25 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      
+
       - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      
+
       - name: Get tag from VERSION file
         id: meta
         run: |
           VERSION=$(npm run version --silent)
           TAG=${VERSION}
           echo "::set-output name=tag::${TAG}"
-      
+
       - name: Build and push images
         uses: docker/build-push-action@v3
         with:
           context: .
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: meienberger/runtipi:latest,meienberger/runtipi:${{ steps.meta.outputs.TAG }}
           cache-from: type=registry,ref=meienberger/runtipi:buildcache
@@ -48,7 +47,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           package-path: ./package.json
-    
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@latest

+ 3 - 1
package.json

@@ -13,7 +13,9 @@
     "version": "echo $npm_package_version",
     "release:rc": "./scripts/deploy/release-rc.sh",
     "test:build": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t meienberger/runtipi:test .",
-    "test:build:arm64": "docker buildx build --platform linux/arm64 -t meienberger/runtipi:test ."
+    "test:build:arm64": "docker buildx build --platform linux/arm64 -t meienberger/runtipi:test .",
+    "test:build:arm7": "docker buildx build --platform linux/arm/v7 -t meienberger/runtipi:test .",
+    "test:build:amd64": "docker buildx build --platform linux/amd64 -t meienberger/runtipi:test ."
   },
   "devDependencies": {
     "@commitlint/cli": "^17.0.3",

+ 1 - 1
packages/dashboard/package.json

@@ -101,7 +101,7 @@
     "msw": "^1.0.0",
     "next-router-mock": "^0.8.0",
     "prettier": "^2.8.4",
-    "prisma": "^4.8.0",
+    "prisma": "^4.10.1",
     "ts-jest": "^29.0.3",
     "ts-node": "^10.9.1",
     "typescript": "4.9.4",

+ 1 - 1
packages/dashboard/pnpm-lock.yaml

@@ -63,7 +63,7 @@ specifiers:
   node-fetch-commonjs: ^3.2.4
   pg: ^8.7.3
   prettier: ^2.8.4
-  prisma: ^4.8.0
+  prisma: ^4.10.1
   react: 18.2.0
   react-dom: 18.2.0
   react-hook-form: ^7.38.0