Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

πŸš€ Release v0.17.3 #1142

Closed
wants to merge 85 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
4a9d722
chore: typo "accesed" changed to "accessed" for TS code
nktnet1 Jan 8, 2025
dd3618b
Add inline button telegram (#3)
shiqocred Jan 11, 2025
1d8db07
Add inline button telegram (#4)
shiqocred Jan 11, 2025
c0b8a41
Update build-success.ts (#5)
shiqocred Jan 11, 2025
d2094d6
Update notification.ts (#6)
shiqocred Jan 11, 2025
537950d
Revision notification (#7)
shiqocred Jan 13, 2025
2de0e73
Merge branch 'Dokploy:canary' into canary
shiqocred Jan 13, 2025
b17ab6d
feat(template): added cloudflared
nktnet1 Jan 13, 2025
fb33a5b
style: make sure card do use the full width of the div
DJKnaeckebrot Jan 13, 2025
8b203c4
feat: update sidebar with Traefik File System title and add support link
DJKnaeckebrot Jan 13, 2025
b68273c
style: adjust grid layout for monitoring card and clean up class names
DJKnaeckebrot Jan 13, 2025
b3ff14f
style: clean up class names for consistency in dashboard components
DJKnaeckebrot Jan 13, 2025
94ee539
refactor: apply ease-out to sidebar toggle animation
joaotonaco Jan 13, 2025
c5eb8b0
refactor: transition logo size
joaotonaco Jan 13, 2025
1922437
fix: isWSL check was not awaited causing always true
szwabodev Jan 13, 2025
772b24a
fix: fixed missing cluster side item
190km Jan 13, 2025
7b94265
Merge pull request #1107 from joaotonaco/refactor/improve_sidebar_ani…
Siumauricio Jan 14, 2025
ee5afa4
Merge pull request #1110 from szwabodev/fix/wslCheck
Siumauricio Jan 14, 2025
373c5bc
Merge pull request #1106 from DJKnaeckebrot/fix/styling-after-sidebar…
Siumauricio Jan 14, 2025
cb1203e
refactor: exclude cluster from cloud
Siumauricio Jan 14, 2025
5e0b7ba
Merge pull request #1109 from 190km/fix/sidebar
Siumauricio Jan 14, 2025
23b40c1
feat(template): added conduwuit
nktnet1 Jan 14, 2025
ca9552d
chore: sort conduwuit tags
nktnet1 Jan 14, 2025
5b633ec
fix: db type typo
TheLetslook Jan 14, 2025
351e4b6
Merge pull request #1115 from TheLetslook/patch-1
Siumauricio Jan 16, 2025
4e724d8
feat: add ci skip check
izayl Jan 16, 2025
c3d3c7b
refactor: update icon handling and restructure sidebar external links
vishalkadam47 Jan 16, 2025
013ee89
style: fix tablet and mobile (Create from Template)
thebadking Jan 16, 2025
26a67dd
Merge pull request #1119 from wish-oss/extrernal-link
Siumauricio Jan 17, 2025
1d760bd
Merge pull request #1104 from nktnet1/cloudflared-template
Siumauricio Jan 17, 2025
9f03faa
Merge branch 'canary' into conduwuit-template
Siumauricio Jan 17, 2025
abff70f
refactor: lint
Siumauricio Jan 17, 2025
f70192a
refactor: lint
Siumauricio Jan 17, 2025
ad479c4
Merge pull request #1112 from nktnet1/conduwuit-template
Siumauricio Jan 17, 2025
0116d99
test: extractCommitMessage
izayl Jan 17, 2025
e69c602
chore: enhance deployment skip message to include reason for skipping
izayl Jan 17, 2025
c5073c9
feat(template): added it-tools
nktnet1 Jan 17, 2025
a9a0b4c
feat: added couchdb template
Jan 17, 2025
e257f86
feat(style): custom scrollbar styling
TheLetslook Jan 17, 2025
0893149
style: grid fix
thebadking Jan 17, 2025
10b3543
fix: Update link text and destination for db backup settings
agustints Jan 18, 2025
cc473b3
feat(notifications): implement gotify provider
depado Jan 10, 2025
1f8a476
chore(lint): run biome
depado Jan 10, 2025
e25d0c0
feat(notifications): implement notifications for gotify
depado Jan 13, 2025
9806a5d
feat(notifications): fix gotify style
depado Jan 18, 2025
e8f2ab3
Merge pull request #1121 from thebadking/canary
Siumauricio Jan 18, 2025
a8f8a72
Merge pull request #1128 from TheLetslook/patch-1
Siumauricio Jan 18, 2025
74a2f79
Merge pull request #1123 from nktnet1/it-tools-template
Siumauricio Jan 18, 2025
31a35d9
Merge pull request #1088 from shiqocred/canary
Siumauricio Jan 18, 2025
c4e5c81
Merge branch 'canary' into gotify-notifications
Siumauricio Jan 18, 2025
6c4d94c
Merge pull request #1118 from izayl/feature/ci-skip
Siumauricio Jan 18, 2025
cecd371
Merge pull request #1081 from depado/gotify-notifications
Siumauricio Jan 18, 2025
a8f63bb
Merge pull request #1131 from agustints/fix/db-backups-destination-url
Siumauricio Jan 18, 2025
2dca0d3
Merge pull request #1069 from nktnet1/accessed-typo
Siumauricio Jan 18, 2025
d060eec
Update apps/dokploy/templates/couchdb/docker-compose.yml
Siumauricio Jan 18, 2025
65c0ea8
Merge branch 'canary' into feat/add-couch-db-template
Siumauricio Jan 18, 2025
0892744
Merge pull request #1125 from SlavenIvanov/feat/add-couch-db-template
Siumauricio Jan 18, 2025
25a8df5
feat: add cleanup cache on deployments
Siumauricio Jan 19, 2025
52c83fd
refactor: update text
Siumauricio Jan 19, 2025
43b7db0
refactor: add missing values to test
Siumauricio Jan 19, 2025
5310a55
refactor: improve sidebar
Siumauricio Jan 19, 2025
adb204e
refactor: add sidebar persistence
Siumauricio Jan 19, 2025
f9b4f00
Merge pull request #1134 from Dokploy/1031-excessive-unused-docker-ca…
Siumauricio Jan 19, 2025
e82db47
refactor: add github docker
Siumauricio Jan 19, 2025
b6ae502
refactor: update
Siumauricio Jan 19, 2025
539aa7a
refactor: print version
Siumauricio Jan 19, 2025
1e4a41a
chore: replace circle with github actions
Siumauricio Jan 19, 2025
4b6f910
refactor: update
Siumauricio Jan 19, 2025
65659e2
Merge pull request #1137 from Dokploy/feat/github-runners
Siumauricio Jan 19, 2025
8aa655a
chore: add pr
Siumauricio Jan 19, 2025
1e006cb
chore: bump version
Siumauricio Jan 19, 2025
3ec2e2d
Revert "chore: bump version"
Siumauricio Jan 19, 2025
f27830d
refactor: update version
Siumauricio Jan 19, 2025
64fc3c7
chore: remove pr
Siumauricio Jan 19, 2025
94ffa7d
chore: update
Siumauricio Jan 19, 2025
3d602c2
refactor: update
Siumauricio Jan 19, 2025
498678c
Revert "refactor: update"
Siumauricio Jan 19, 2025
3f8bc47
refactor: update
Siumauricio Jan 19, 2025
95b67ef
chore: update
Siumauricio Jan 19, 2025
84690c5
chore: update pr
Siumauricio Jan 19, 2025
7dca4fe
refactor: update
Siumauricio Jan 19, 2025
1956836
refactor: update
Siumauricio Jan 19, 2025
60748da
chore: update
Siumauricio Jan 19, 2025
6d052ad
chore: add quotes
Siumauricio Jan 19, 2025
4f11fc2
chore: remove spaces
Siumauricio Jan 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 0 additions & 119 deletions .circleci/config.yml

This file was deleted.

84 changes: 84 additions & 0 deletions .github/workflows/create-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
name: Auto PR to main when version changes

on:
push:
branches:
- canary

permissions:
contents: write
pull-requests: write

jobs:
create-pr:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Get version from package.json
id: package_version
run: echo "VERSION=$(jq -r .version ./apps/dokploy/package.json)" >> $GITHUB_ENV

- name: Get latest GitHub tag
id: latest_tag
run: |
LATEST_TAG=$(git ls-remote --tags origin | awk -F'/' '{print $3}' | sort -V | tail -n1)
echo "LATEST_TAG=$LATEST_TAG" >> $GITHUB_ENV
echo $LATEST_TAG
- name: Compare versions
id: compare_versions
run: |
if [ "${{ env.VERSION }}" != "${{ env.LATEST_TAG }}" ]; then
VERSION_CHANGED="true"
else
VERSION_CHANGED="false"
fi
echo "VERSION_CHANGED=$VERSION_CHANGED" >> $GITHUB_ENV
echo "Comparing versions:"
echo "Current version: ${{ env.VERSION }}"
echo "Latest tag: ${{ env.LATEST_TAG }}"
echo "Version changed: $VERSION_CHANGED"
- name: Check if a PR already exists
id: check_pr
run: |
PR_EXISTS=$(gh pr list --state open --base main --head canary --json number --jq '. | length')
echo "PR_EXISTS=$PR_EXISTS" >> $GITHUB_ENV
env:
GH_TOKEN: ${{ secrets.GH_PAT }}

- name: Create Pull Request
if: env.VERSION_CHANGED == 'true' && env.PR_EXISTS == '0'
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"

git fetch origin main
git checkout canary
git push origin canary

gh pr create \
--title "πŸš€ Release ${{ env.VERSION }}" \
--body '
This PR promotes changes from `canary` to `main` for version ${{ env.VERSION }}.

### πŸ” Changes Include:
- Version bump to ${{ env.VERSION }}
- All changes from canary branch

### βœ… Pre-merge Checklist:
- [ ] All tests passing
- [ ] Documentation updated
- [ ] Docker images built and tested

> πŸ€– This PR was automatically generated by [GitHub Actions](https://github.com/actions)' \
--base main \
--head canary \
--draft \
--label "release" --label "automated pr" || true \
--reviewer siumauricio \
--assignee siumauricio
env:
GH_TOKEN: ${{ github.token }}
134 changes: 134 additions & 0 deletions .github/workflows/dokploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
name: Dokploy Docker Build

on:
push:
branches: [main, canary, feat/github-runners]

env:
IMAGE_NAME: dokploy/dokploy

jobs:
docker-amd:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Set tag and version
id: meta
run: |
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
TAG="latest"
VERSION=$(node -p "require('./apps/dokploy/package.json').version")
elif [ "${{ github.ref }}" = "refs/heads/canary" ]; then
TAG="canary"
else
TAG="feature"
fi
echo "tags=${IMAGE_NAME}:${TAG}-amd64" >> $GITHUB_OUTPUT

- name: Prepare env file
run: |
cp apps/dokploy/.env.production.example .env.production
cp apps/dokploy/.env.production.example apps/dokploy/.env.production

- name: Build and push
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64
push: true
tags: ${{ steps.meta.outputs.tags }}
docker-arm:
runs-on: ubuntu-24.04-arm
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Set tag and version
id: meta
run: |
VERSION=$(node -p "require('./apps/dokploy/package.json').version")
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
TAG="latest"
VERSION=$(node -p "require('./apps/dokploy/package.json').version")
elif [ "${{ github.ref }}" = "refs/heads/canary" ]; then
TAG="canary"
else
TAG="feature"
fi
echo "tags=${IMAGE_NAME}:${TAG}-arm64" >> $GITHUB_OUTPUT

- name: Prepare env file
run: |
cp apps/dokploy/.env.production.example .env.production
cp apps/dokploy/.env.production.example apps/dokploy/.env.production

- name: Build and push
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}

combine-manifests:
needs: [docker-amd, docker-arm]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Create and push manifests
run: |
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
VERSION=$(node -p "require('./apps/dokploy/package.json').version")
TAG="latest"

docker buildx imagetools create -t ${IMAGE_NAME}:${TAG} \
${IMAGE_NAME}:${TAG}-amd64 \
${IMAGE_NAME}:${TAG}-arm64

docker buildx imagetools create -t ${IMAGE_NAME}:${VERSION} \
${IMAGE_NAME}:${TAG}-amd64 \
${IMAGE_NAME}:${TAG}-arm64

elif [ "${{ github.ref }}" = "refs/heads/canary" ]; then
TAG="canary"
docker buildx imagetools create -t ${IMAGE_NAME}:${TAG} \
${IMAGE_NAME}:${TAG}-amd64 \
${IMAGE_NAME}:${TAG}-arm64

else
TAG="feature"
docker buildx imagetools create -t ${IMAGE_NAME}:${TAG} \
${IMAGE_NAME}:${TAG}-amd64 \
${IMAGE_NAME}:${TAG}-arm64
fi
Loading
Loading