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

Merge remote-tracking branch 'my/canary' into canary

Browse Source
This commit is contained in:
songtianlun 2024-08-18 01:40:34 +08:00
commit eb219221be
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.circleci/config.yml
View File

@ -20,8 +20,8 @@ jobs:
else else
TAG="canary" TAG="canary"
fi fi
docker build --platform linux/amd64 -t dokploy/dokploy:${TAG}-amd64 . docker build --platform linux/amd64 -t songtianlun/dokploy:${TAG}-amd64 .
docker push dokploy/dokploy:${TAG}-amd64 docker push songtianlun/dokploy:${TAG}-amd64
build-arm64: build-arm64:
machine: machine:
@ -43,8 +43,8 @@ jobs:
else else
TAG="canary" TAG="canary"
fi fi
docker build --platform linux/arm64 -t dokploy/dokploy:${TAG}-arm64 . docker build --platform linux/arm64 -t songtianlun/dokploy:${TAG}-arm64 .
docker push dokploy/dokploy:${TAG}-arm64 docker push songtianlun/dokploy:${TAG}-arm64
combine-manifests: combine-manifests:
docker: docker:
@ -62,21 +62,21 @@ jobs:
echo $VERSION echo $VERSION
TAG="latest" TAG="latest"
docker manifest create dokploy/dokploy:${TAG} \ docker manifest create songtianlun/dokploy:${TAG} \
dokploy/dokploy:${TAG}-amd64 \ songtianlun/dokploy:${TAG}-amd64 \
dokploy/dokploy:${TAG}-arm64 songtianlun/dokploy:${TAG}-arm64
docker manifest push dokploy/dokploy:${TAG} docker manifest push songtianlun/dokploy:${TAG}
docker manifest create dokploy/dokploy:${VERSION} \ docker manifest create songtianlun/dokploy:${VERSION} \
dokploy/dokploy:${TAG}-amd64 \ songtianlun/dokploy:${TAG}-amd64 \
dokploy/dokploy:${TAG}-arm64 songtianlun/dokploy:${TAG}-arm64
docker manifest push dokploy/dokploy:${VERSION} docker manifest push songtianlun/dokploy:${VERSION}
else else
TAG="canary" TAG="canary"
docker manifest create dokploy/dokploy:${TAG} \ docker manifest create songtianlun/dokploy:${TAG} \
dokploy/dokploy:${TAG}-amd64 \ songtianlun/dokploy:${TAG}-amd64 \
dokploy/dokploy:${TAG}-arm64 songtianlun/dokploy:${TAG}-arm64
docker manifest push dokploy/dokploy:${TAG} docker manifest push songtianlun/dokploy:${TAG}
fi fi
workflows: workflows:

4
.github/workflows/deploy.yml vendored
View File

@ -24,7 +24,7 @@ jobs:
context: . context: .
file: ./Dockerfile.docs file: ./Dockerfile.docs
push: true push: true
tags: dokploy/docs:latest tags: songtianlun/dokploy-docs:latest
platforms: linux/amd64 platforms: linux/amd64
build-and-push-image-website: build-and-push-image-website:
@ -46,5 +46,5 @@ jobs:
context: . context: .
file: ./Dockerfile.website file: ./Dockerfile.website
push: true push: true
tags: dokploy/website:latest tags: songtianlun/dokploy-website:latest
platforms: linux/amd64 platforms: linux/amd64