Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: update

Browse Source
This commit is contained in:
Mauricio Siu
2024-10-24 23:18:23 -06:00
parent 47aa223f87
commit c42f5cb799
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
.circleci/config.yml
View File

@@ -22,7 +22,6 @@ jobs:
TAG="canary" TAG="canary"
fi fi
docker build --platform linux/amd64 -t dokploy/dokploy:${TAG}-amd64 . docker build --platform linux/amd64 -t dokploy/dokploy:${TAG}-amd64 .
docker push dokploy/dokploy:${TAG}-amd64
build-arm64: build-arm64:
machine: machine:
@@ -45,7 +44,6 @@ jobs:
TAG="canary" TAG="canary"
fi fi
docker build --platform linux/arm64 -t dokploy/dokploy:${TAG}-arm64 . docker build --platform linux/arm64 -t dokploy/dokploy:${TAG}-arm64 .
docker push dokploy/dokploy:${TAG}-arm64
combine-manifests: combine-manifests:
docker: docker:
@@ -58,27 +56,27 @@ jobs:
command: | command: |
docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_TOKEN docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_TOKEN
if [ "${CIRCLE_BRANCH}" == "main" ]; then # if [ "${CIRCLE_BRANCH}" == "main" ]; then
VERSION=$(node -p "require('./apps/dokploy/package.json').version") # VERSION=$(node -p "require('./apps/dokploy/package.json').version")
echo $VERSION # echo $VERSION
TAG="latest" # TAG="latest"
docker manifest create dokploy/dokploy:${TAG} \ # docker manifest create dokploy/dokploy:${TAG} \
dokploy/dokploy:${TAG}-amd64 \ # dokploy/dokploy:${TAG}-amd64 \
dokploy/dokploy:${TAG}-arm64 # dokploy/dokploy:${TAG}-arm64
docker manifest push dokploy/dokploy:${TAG} # docker manifest push dokploy/dokploy:${TAG}
docker manifest create dokploy/dokploy:${VERSION} \ # docker manifest create dokploy/dokploy:${VERSION} \
dokploy/dokploy:${TAG}-amd64 \ # dokploy/dokploy:${TAG}-amd64 \
dokploy/dokploy:${TAG}-arm64 # dokploy/dokploy:${TAG}-arm64
docker manifest push dokploy/dokploy:${VERSION} # docker manifest push dokploy/dokploy:${VERSION}
else # else
TAG="canary" # TAG="canary"
docker manifest create dokploy/dokploy:${TAG} \ # docker manifest create dokploy/dokploy:${TAG} \
dokploy/dokploy:${TAG}-amd64 \ # dokploy/dokploy:${TAG}-amd64 \
dokploy/dokploy:${TAG}-arm64 # dokploy/dokploy:${TAG}-arm64
docker manifest push dokploy/dokploy:${TAG} # docker manifest push dokploy/dokploy:${TAG}
fi # fi
workflows: workflows:
build-all: build-all:
@@ -89,12 +87,14 @@ workflows:
only: only:
- main - main
- canary - canary
- feat/remove-build-on-server
- build-arm64: - build-arm64:
filters: filters:
branches: branches:
only: only:
- main - main
- canary - canary
- feat/remove-build-on-server
- combine-manifests: - combine-manifests:
requires: requires:
- build-amd64 - build-amd64

2
apps/dokploy/__test__/drop/drop.test.test.ts
View File

@@ -1,6 +1,6 @@
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import path from "node:path"; import path from "node:path";
import { paths } from "@dokploy/server/dist/constants"; import { paths } from "@dokploy/server/constants";
const { APPLICATIONS_PATH } = paths(); const { APPLICATIONS_PATH } = paths();
import type { ApplicationNested } from "@dokploy/server"; import type { ApplicationNested } from "@dokploy/server";
import { unzipDrop } from "@dokploy/server"; import { unzipDrop } from "@dokploy/server";