Skip to content

[pull] master from Yacht-sh:master #7

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.

Sign up for GitHub

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

Merged
pull merged 18 commits into from
Jul 1, 2025
Merged

[pull] master from Yacht-sh:master #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
50b0d3e
Update workflows to push images to GHCR
wickedyoda Jul 1, 2025
501b130
Merge pull request #759 from Yacht-sh/codex/update-all-packages-to-la…
wickedyoda Jul 1, 2025
88de741
Working on workfile
wickedyoda Jul 1, 2025
4ea707c
Work on requirements pip errors in docker file
wickedyoda Jul 1, 2025
76bd7f5
Merge pull request #760 from Yacht-sh/Update-from-Yoda
wickedyoda Jul 1, 2025
204cb5e
Update repository references
wickedyoda Jul 1, 2025
fe39046
Merge pull request #761 from Yacht-sh/codex/update-repository-referen…
wickedyoda Jul 1, 2025
b8dcae3
Updated Readme Files
wickedyoda Jul 1, 2025
03b6c5f
Update FUNDING.yml
wickedyoda Jul 1, 2025
b56d2ba
Update repo references
wickedyoda Jul 1, 2025
2a44c81
Merge pull request #762 from Yacht-sh/codex/update-repo-references-to…
wickedyoda Jul 1, 2025
ed75ef6
Create FUNDING.yml
wickedyoda Jul 1, 2025
25531e0
Merge branch 'master' into bring-yacht-up-to-date
wickedyoda Jul 1, 2025
e8d7844
Merge pull request #764 from Yacht-sh/bring-yacht-up-to-date
wickedyoda Jul 1, 2025
63a6c6f
Removed pycharm left over. files
wickedyoda Jul 1, 2025
b51ab90
Merge branch 'master' of https://github.com/Yacht-sh/Yacht
wickedyoda Jul 1, 2025
406b199
Update GitHub workflow actions to latest versions
wickedyoda Jul 1, 2025
1c20dd5
Merge pull request #766 from Yacht-sh/codex/update-build.yml-to-v3-or-v4
wickedyoda Jul 1, 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
4 changes: 0 additions & 4 deletions .github/FUNDING.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
# These are supported funding model platforms

github: SelfhostedPro
open_collective: selfhostedpros
23 changes: 8 additions & 15 deletions .github/workflows/build-devel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,46 +16,39 @@ jobs:
format: YYYY-MM-DD--HH

- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3

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

- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }}

- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
platforms: linux/amd64,linux/arm64,linux/arm
push: true
build-args: |
VUE_APP_VERSION=devel-${{ steps.current-time.outputs.formattedTime }}
tags: |
selfhostedpro/yacht:devel
selfhostedpro/yacht:devel-${{ steps.current-time.outputs.formattedTime }}
ghcr.io/selfhostedpro/yacht:devel
ghcr.io/selfhostedpro/yacht:devel-${{ steps.current-time.outputs.formattedTime }}
ghcr.io/${{ github.repository_owner }}/yacht:devel
ghcr.io/${{ github.repository_owner }}/yacht:devel-${{ steps.current-time.outputs.formattedTime }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
23 changes: 8 additions & 15 deletions .github/workflows/build-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,46 +16,39 @@ jobs:
format: YYYY-MM-DD--HH

- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3

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

- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }}

- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
platforms: linux/amd64,linux/arm64,linux/arm
push: true
build-args: |
VUE_APP_VERSION=nightly-${{ steps.current-time.outputs.formattedTime }}
tags: |
selfhostedpro/yacht:nightly
selfhostedpro/yacht:nightly-${{ steps.current-time.outputs.formattedTime }}
ghcr.io/selfhostedpro/yacht:nightly
ghcr.io/selfhostedpro/yacht:nightly-${{ steps.current-time.outputs.formattedTime }}
ghcr.io/${{ github.repository_owner }}/yacht:nightly
ghcr.io/${{ github.repository_owner }}/yacht:nightly-${{ steps.current-time.outputs.formattedTime }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
61 changes: 0 additions & 61 deletions .github/workflows/build-wicked-testdeploy.yml
View file
Open in desktop

This file was deleted.

26 changes: 9 additions & 17 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,48 +16,40 @@ jobs:
format: YYYY-MM-DD--HH

- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3

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

- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }}

- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
platforms: linux/amd64,linux/arm64,linux/arm
push: true
build-args: |
VUE_APP_VERSION=v0.0.7-alpha-${{ steps.current-time.outputs.formattedTime }}
tags: |
selfhostedpro/yacht
selfhostedpro/yacht:latest-${{ steps.current-time.outputs.formattedTime }}
selfhostedpro/yacht:v0.0.7-alpha-${{ steps.current-time.outputs.formattedTime }}
ghcr.io/selfhostedpro/yacht
ghcr.io/selfhostedpro/yacht:latest-${{ steps.current-time.outputs.formattedTime }}
ghcr.io/selfhostedpro/yacht:v0.0.7-alpha-${{ steps.current-time.outputs.formattedTime }}
ghcr.io/${{ github.repository_owner }}/yacht
ghcr.io/${{ github.repository_owner }}/yacht:latest-${{ steps.current-time.outputs.formattedTime }}
ghcr.io/${{ github.repository_owner }}/yacht:v0.0.7-alpha-${{ steps.current-time.outputs.formattedTime }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand All @@ -50,7 +50,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand Down
26 changes: 9 additions & 17 deletions .github/workflows/docker-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ "develop" ]

jjobs:
jobs:
build:
runs-on: ubuntu-latest
steps:
Expand All @@ -15,46 +15,38 @@ jjobs:
format: YYYY-MM-DD--HH

- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3

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

- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }}

- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
platforms: linux/amd64,linux/arm64,linux/arm
push: true
build-args: |
VUE_APP_VERSION=devel-${{ steps.current-time.outputs.formattedTime }}
tags: |
selfhostedpro/yacht:devel
selfhostedpro/yacht:devel-${{ steps.current-time.outputs.formattedTime }}
ghcr.io/selfhostedpro/yacht:devel
ghcr.io/selfhostedpro/yacht:devel-${{ steps.current-time.outputs.formattedTime }}
ghcr.io/${{ github.repository_owner }}/yacht:devel
ghcr.io/${{ github.repository_owner }}/yacht:devel-${{ steps.current-time.outputs.formattedTime }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
10 changes: 5 additions & 5 deletions .github/workflows/ghcr-mirror.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@ jobs:
steps:
-
name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
-
name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
name: Login to ${{ github.event.inputs.dest-registry }}
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ${{ github.event.inputs.dest-registry }}
username: selfhostedpro
username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }}
-
name: Mirror ${{ github.event.inputs.dockerhub-repo }} to ${{ github.event.inputs.dest-registry }}/${{ github.event.inputs.dest-repo }}
Expand Down
20 changes: 7 additions & 13 deletions .github/workflows/manual-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,45 +18,39 @@ jobs:
format: YYYY-MM-DD--HH

- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.release }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3

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

- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }}

- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
platforms: linux/amd64,linux/arm64,linux/arm
push: true
build-args: |
VUE_APP_VERSION=${{ github.event.inputs.release }}
tags: |
selfhostedpro/yacht:${{ github.event.inputs.release }}
ghcr.io/selfhostedpro/yacht:${{ github.event.inputs.release }}
ghcr.io/${{ github.repository_owner }}/yacht:${{ github.event.inputs.release }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
Loading
Loading