Merge pull request #50 from Dokploy/canary

v0.0.2

Author: Siumauricio

.github/workflows/pull-request.yml

@@ -31,28 +31,6 @@ jobs:
     - name: Run Build
       run: pnpm build
 
-
-  build-docker-on-pr:
-    if: github.event_name == 'pull_request'
-    needs: build-app
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the code
-        uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Prepare .env file
-        run: |
-          cp .env.production.example .env.production
-
-      - name: Run custom Docker build script
-        run: |
-          chmod +x ./docker/build.sh
-          echo "Building Docker image for ${{ github.base_ref }}"
-          ./docker/build.sh ${{ github.base_ref == 'canary' && 'canary' || '' }}
-  
   build-and-push-docker-on-push:
     if: github.event_name == 'push'
     runs-on: ubuntu-latest
@@ -75,7 +53,5 @@ jobs:
 
       - name: Build and push Docker image using custom script
         run: |
-          chmod +x ./docker/build.sh
           chmod +x ./docker/push.sh
-          ./docker/build.sh ${{ github.ref_name == 'canary' && 'canary' || '' }}
           ./docker/push.sh ${{ github.ref_name == 'canary' && 'canary' || '' }}

docker/build.sh

@@ -10,9 +10,8 @@ else
     TAG="$VERSION"
 fi
 
-docker build --platform linux/amd64 --pull --rm -f 'Dockerfile' -t "dokploy/dokploy:${TAG}" .
+BUILDER=$(docker buildx create --use)
 
-if [ "$BUILD_TYPE" != "canary" ]; then
-    # Tag the production build as latest
-    docker tag "dokploy/dokploy:${TAG}" "dokploy/dokploy:latest"
-fi
+docker buildx build --platform linux/amd64,linux/arm64 --pull --rm -t "dokploy/dokploy:${TAG}" -f 'Dockerfile' .
+
+docker buildx rm $BUILDER

docker/push.sh

@@ -3,13 +3,16 @@
 # Determine the type of build based on the first script argument
 BUILD_TYPE=${1:-production}
 
+BUILDER=$(docker buildx create --use)
+
 if [ "$BUILD_TYPE" == "canary" ]; then
     TAG="canary"
     echo PUSHING CANARY
-    docker push "dokploy/dokploy:${TAG}"
+        docker buildx build --platform linux/amd64,linux/arm64 --pull --rm -t "dokploy/dokploy:${TAG}" -f 'Dockerfile' --push .
 else
     echo  "PUSHING PRODUCTION"
     VERSION=$(node -p "require('./package.json').version")
-    docker push "dokploy/dokploy:${VERSION}"
-    docker push "dokploy/dokploy:latest"
+    docker buildx build --platform linux/amd64,linux/arm64 --pull --rm -t "dokploy/dokploy:latest" -t "dokploy/dokploy:${VERSION}" -f 'Dockerfile' --push .
 fi
+
+docker buildx rm $BUILDER

next.config.mjs

@@ -6,11 +6,6 @@
 /** @type {import("next").NextConfig} */
 const nextConfig = {
   reactStrictMode: true,
-  logging:{
-    fetches:{
-      fullUrl:false
-    }
-  },
 
   /**
    * If you are using `appDir` then you must comment the below `i18n` config out.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dokploy",
-  "version": "v0.0.1",
+  "version": "v0.0.2",
   "private": true,
   "license": "AGPL-3.0-only",
   "type": "module",

pnpm-lock.yaml

@@ -52,7 +52,7 @@ export const domainRouter = createTRPCRouter({
 		.mutation(async ({ input }) => {
 			const domain = await findDomainById(input.domainId);
 			const result = await removeDomainById(input.domainId);
-			removeDomain(domain.application.appName, domain.uniqueConfigKey);
+			await removeDomain(domain.application.appName, domain.uniqueConfigKey);
 
 			return result;
 		}),

server/api/routers/domain.ts

@@ -36,9 +36,8 @@ export const createApplication = async (
 			});
 		}
 
-		createTraefikConfig(newApplication.appName);
-
 		if (process.env.NODE_ENV === "development") {
+			createTraefikConfig(newApplication.appName);
 			await tx.insert(domains).values({
 				applicationId: newApplication.applicationId,
 				host: `${newApplication.appName}.docker.localhost`,

server/api/services/application.ts

@@ -48,9 +48,9 @@ void app.prepare().then(async () => {
 			await initializeNetwork();
 			createDefaultTraefikConfig();
 			createDefaultServerTraefikConfig();
+			await initializePostgres();
 			await initializeTraefik();
 			await initializeRedis();
-			await initializePostgres();
 			initCronJobs();
 			welcomeServer();
 

server/server.ts

@@ -17,7 +17,7 @@ import { buildPaketo } from "./paketo";
 // NIXPACKS codeDirectory = where is the path of the code directory
 // HEROKU codeDirectory = where is the path of the code directory
 // PAKETO codeDirectory = where is the path of the code directory
-// DOKERFILE codeDirectory = where is the exact path of the (Dockerfile)
+// DOCKERFILE codeDirectory = where is the exact path of the (Dockerfile)
 export type ApplicationNested = InferResultType<
 	"applications",
 	{ mounts: true; security: true; redirects: true; ports: true }