Merge pull request #714 from coollabsio/next

v3.11.2
2022-11-08 12:09:09 +01:00 · 2022-11-08 12:09:09 +01:00 · 95c810b80a
commit 95c810b80a
parent 7b8f81f1b2 82d7fb883d
6 changed files with 44 additions and 15 deletions
--- a/.github/workflows/staging-release.yml
+++ b/.github/workflows/staging-release.yml
@ -6,6 +6,34 @@ on:
      - next

 jobs:
+  arm64:
+    runs-on: [self-hosted, arm64]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: "next"
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Get current package version
+        uses: martinbeentjes/npm-get-version-action@v1.2.3
+        id: package-version
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/arm64
+          push: true
+          tags: coollabsio/coolify:next-arm64
+          cache-from: type=registry,ref=coollabsio/coolify:buildcache-next-arm64
+          cache-to: type=registry,ref=coollabsio/coolify:buildcache-next-arm64,mode=max
  amd64:
    runs-on: ubuntu-latest
    steps:
@ -36,7 +64,7 @@ jobs:
          cache-to: type=registry,ref=coollabsio/coolify:buildcache-next-amd64,mode=max
  merge-manifest:
    runs-on: ubuntu-latest
-    needs: [amd64]
+    needs: [arm64, amd64]
    steps:
      - name: Checkout
        uses: actions/checkout@v3
@ -51,7 +79,7 @@ jobs:
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Create & publish manifest
        run: |
-          docker manifest create coollabsio/coolify:next --amend coollabsio/coolify:next-amd64
+          docker manifest create coollabsio/coolify:next --amend coollabsio/coolify:next-amd64 --amend coollabsio/coolify:next-arm64
          docker manifest push coollabsio/coolify:next
      - uses: sarisia/actions-status-discord@v1
        if: always()
--- a/apps/api/devTemplates.yaml
+++ b/apps/api/devTemplates.yaml
@ -1891,6 +1891,7 @@
      description: ""
      showOnConfiguration: true
 - templateVersion: 1.0.0
+  ignore: true
  defaultVersion: latest
  documentation: https://ghost.org/resources/
  type: ghost-mariadb
--- a/apps/api/src/routes/webhooks/traefik/handlers.ts
+++ b/apps/api/src/routes/webhooks/traefik/handlers.ts
@ -129,10 +129,10 @@ function generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, is
 		}
 	}
 	return {
-		[serviceId]: { ...http },
-		[`${serviceId}-secure`]: { ...https },
-		[`${serviceId}-www`]: { ...httpWWW },
-		[`${serviceId}-secure-www`]: { ...httpsWWW },
+		[`${serviceId}-${pathPrefix}`]: { ...http },
+		[`${serviceId}-${pathPrefix}-secure`]: { ...https },
+		[`${serviceId}-${pathPrefix}-www`]: { ...httpWWW },
+		[`${serviceId}-${pathPrefix}-secure-www`]: { ...httpsWWW },
 	}
 }
 export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote: boolean = false) {
@ -310,7 +310,7 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 									const pathPrefix = '/'
 									const isCustomSSL = false;
 									const dualCerts = false;
-									const serviceId = `${id}-${port || 'default'}-${pathPrefix}`
+									const serviceId = `${id}-${port || 'default'}`

 									traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
 									traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, containerId, port) }
@ -329,7 +329,7 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 					const isHttps = fqdn.startsWith('https://');
 					const isWWW = fqdn.includes('www.');
 					const pathPrefix = '/'
-					const serviceId = `${id}-${port || 'default'}-${pathPrefix}`
+					const serviceId = `${id}-${port || 'default'}`
 					traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
 					traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, id, port) }
 					if (previews) {
@ -344,7 +344,7 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 								const previewDomain = `${container.split('-')[1]}.${domain}`;
 								const nakedDomain = previewDomain.replace(/^www\./, '');
 								const pathPrefix = '/'
-								const serviceId = `${container}-${port || 'default'}-${pathPrefix}`
+								const serviceId = `${container}-${port || 'default'}`
 								traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, previewDomain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
 								traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, container, port) }
 							}
@ -426,7 +426,7 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 								const isHttps = fqdn.startsWith('https://');
 								const isWWW = fqdn.includes('www.');
 								const isCustomSSL = false;
-								const serviceId = `${oneService}-${port || 'default'}-${pathPrefix}`
+								const serviceId = `${oneService}-${port || 'default'}`
 								traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
 								traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, oneService, port) }
 							}
@ -443,7 +443,7 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 								const isWWW = fqdn.includes('www.');
 								const pathPrefix = '/'
 								const isCustomSSL = false
-								const serviceId = `${oneService}-${port || 'default'}-${pathPrefix}`
+								const serviceId = `${oneService}-${port || 'default'}`
 								traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
 								traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, id, port) }
 							}
@ -468,7 +468,7 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 			const port = 3000
 			const pathPrefix = '/'
 			const isCustomSSL = false
-			const serviceId = `${id}-${port || 'default'}-${pathPrefix}`
+			const serviceId = `${id}-${port || 'default'}`
 			traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
 			traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, container, port) }
 		}
--- a/apps/api/templates.json
+++ b/apps/api/templates.json
--- a/apps/ui/src/routes/services/[id]/configuration/type.svelte
+++ b/apps/ui/src/routes/services/[id]/configuration/type.svelte
@ -116,7 +116,7 @@
 </div>
 <div class=" lg:pt-20 lg:p-0 px-8 pt-20">
 	<div class="grid grid-flow-rows grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-8">
-		{#each sortMe(filteredServices) as service}
+		{#each sortMe(filteredServices).filter(s=> !s.ignore) as service}
 			{#key service.name}
 				<button
 					on:click={() => handleSubmit(service)}
--- a/package.json
+++ b/package.json
@ -25,7 +25,7 @@
    "build:api": "NODE_ENV=production pnpm run --filter api build",
    "build:ui": "NODE_ENV=production pnpm run --filter ui build",
    "dockerlogin": "echo $DOCKER_PASS | docker login --username=$DOCKER_USER --password-stdin",
-    "release:staging:amd": "cross-var docker buildx build --platform linux/amd64 -t coollabsio/coolify:next --push .",
+    "release:staging:amd": "docker build -t coollabsio/coolify:next . && docker push coollabsio/coolify:next",
    "release:local": "rm -fr ./local-serve && mkdir ./local-serve && pnpm build && cp -Rp apps/api/build/* ./local-serve && cp -Rp apps/ui/build/ ./local-serve/public && cp -Rp apps/api/prisma/ ./local-serve/prisma && cp -Rp apps/api/package.json ./local-serve && env | grep '^COOLIFY_' > ./local-serve/.env && cd ./local-serve && pnpm install . && pnpm start"
  },
  "devDependencies": {