From c42f5cb799c97fe0cab5a854234c200d84b07e3a Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Thu, 24 Oct 2024 23:18:23 -0600 Subject: [PATCH] refactor: update --- .circleci/config.yml | 42 ++++++++++---------- apps/dokploy/__test__/drop/drop.test.test.ts | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 07991599..cb07be28 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,6 @@ jobs: TAG="canary" fi docker build --platform linux/amd64 -t dokploy/dokploy:${TAG}-amd64 . - docker push dokploy/dokploy:${TAG}-amd64 build-arm64: machine: @@ -45,7 +44,6 @@ jobs: TAG="canary" fi docker build --platform linux/arm64 -t dokploy/dokploy:${TAG}-arm64 . - docker push dokploy/dokploy:${TAG}-arm64 combine-manifests: docker: @@ -58,27 +56,27 @@ jobs: command: | docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_TOKEN - if [ "${CIRCLE_BRANCH}" == "main" ]; then - VERSION=$(node -p "require('./apps/dokploy/package.json').version") - echo $VERSION - TAG="latest" + # if [ "${CIRCLE_BRANCH}" == "main" ]; then + # VERSION=$(node -p "require('./apps/dokploy/package.json').version") + # echo $VERSION + # TAG="latest" - docker manifest create dokploy/dokploy:${TAG} \ - dokploy/dokploy:${TAG}-amd64 \ - dokploy/dokploy:${TAG}-arm64 - docker manifest push dokploy/dokploy:${TAG} + # docker manifest create dokploy/dokploy:${TAG} \ + # dokploy/dokploy:${TAG}-amd64 \ + # dokploy/dokploy:${TAG}-arm64 + # docker manifest push dokploy/dokploy:${TAG} - docker manifest create dokploy/dokploy:${VERSION} \ - dokploy/dokploy:${TAG}-amd64 \ - dokploy/dokploy:${TAG}-arm64 - docker manifest push dokploy/dokploy:${VERSION} - else - TAG="canary" - docker manifest create dokploy/dokploy:${TAG} \ - dokploy/dokploy:${TAG}-amd64 \ - dokploy/dokploy:${TAG}-arm64 - docker manifest push dokploy/dokploy:${TAG} - fi + # docker manifest create dokploy/dokploy:${VERSION} \ + # dokploy/dokploy:${TAG}-amd64 \ + # dokploy/dokploy:${TAG}-arm64 + # docker manifest push dokploy/dokploy:${VERSION} + # else + # TAG="canary" + # docker manifest create dokploy/dokploy:${TAG} \ + # dokploy/dokploy:${TAG}-amd64 \ + # dokploy/dokploy:${TAG}-arm64 + # docker manifest push dokploy/dokploy:${TAG} + # fi workflows: build-all: @@ -89,12 +87,14 @@ workflows: only: - main - canary + - feat/remove-build-on-server - build-arm64: filters: branches: only: - main - canary + - feat/remove-build-on-server - combine-manifests: requires: - build-amd64 diff --git a/apps/dokploy/__test__/drop/drop.test.test.ts b/apps/dokploy/__test__/drop/drop.test.test.ts index 92821fb5..5df29b55 100644 --- a/apps/dokploy/__test__/drop/drop.test.test.ts +++ b/apps/dokploy/__test__/drop/drop.test.test.ts @@ -1,6 +1,6 @@ import fs from "node:fs/promises"; import path from "node:path"; -import { paths } from "@dokploy/server/dist/constants"; +import { paths } from "@dokploy/server/constants"; const { APPLICATIONS_PATH } = paths(); import type { ApplicationNested } from "@dokploy/server"; import { unzipDrop } from "@dokploy/server";