Skip to content

Commit 76bd7f5

Browse files
wickedyodawickedyoda
authored
Merge pull request #760 from Yacht-sh/Update-from-Yoda
Update from yoda
2 parents 65ecaa4 + 4ea707c commit 76bd7f5

9 files changed

Lines changed: 16 additions & 113 deletions

File tree

‎.github/workflows/build-devel.yml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ jobs:
3939
username: ${{ github.repository_owner }}
4040
password: ${{ secrets.CR_PAT }}
4141

42-
- name: Login to DockerHub
43-
uses: docker/login-action@v1
44-
with:
45-
username: ${{ secrets.DOCKERHUB_USERNAME }}
46-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
4742

4843
- name: Build and push
4944
uses: docker/build-push-action@v2
@@ -53,9 +48,7 @@ jobs:
5348
build-args: |
5449
VUE_APP_VERSION=devel-${{ steps.current-time.outputs.formattedTime }}
5550
tags: |
56-
selfhostedpro/yacht:devel
57-
selfhostedpro/yacht:devel-${{ steps.current-time.outputs.formattedTime }}
58-
ghcr.io/selfhostedpro/yacht:devel
59-
ghcr.io/selfhostedpro/yacht:devel-${{ steps.current-time.outputs.formattedTime }}
51+
ghcr.io/${{ github.repository_owner }}/yacht:devel
52+
ghcr.io/${{ github.repository_owner }}/yacht:devel-${{ steps.current-time.outputs.formattedTime }}
6053
cache-from: type=local,src=/tmp/.buildx-cache
6154
cache-to: type=local,dest=/tmp/.buildx-cache

‎.github/workflows/build-nightly.yml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ jobs:
3939
username: ${{ github.repository_owner }}
4040
password: ${{ secrets.CR_PAT }}
4141

42-
- name: Login to DockerHub
43-
uses: docker/login-action@v1
44-
with:
45-
username: ${{ secrets.DOCKERHUB_USERNAME }}
46-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
4742

4843
- name: Build and push
4944
uses: docker/build-push-action@v2
@@ -53,9 +48,7 @@ jobs:
5348
build-args: |
5449
VUE_APP_VERSION=nightly-${{ steps.current-time.outputs.formattedTime }}
5550
tags: |
56-
selfhostedpro/yacht:nightly
57-
selfhostedpro/yacht:nightly-${{ steps.current-time.outputs.formattedTime }}
58-
ghcr.io/selfhostedpro/yacht:nightly
59-
ghcr.io/selfhostedpro/yacht:nightly-${{ steps.current-time.outputs.formattedTime }}
51+
ghcr.io/${{ github.repository_owner }}/yacht:nightly
52+
ghcr.io/${{ github.repository_owner }}/yacht:nightly-${{ steps.current-time.outputs.formattedTime }}
6053
cache-from: type=local,src=/tmp/.buildx-cache
6154
cache-to: type=local,dest=/tmp/.buildx-cache

‎.github/workflows/build-wicked-testdeploy.yml‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ jobs:
3939
username: ${{ github.repository_owner }}
4040
password: ${{ secrets.CR_PAT }}
4141

42-
- name: Login to DockerHub
43-
uses: docker/login-action@v1
44-
with:
45-
username: ${{ secrets.DOCKERHUB_USERNAME }}
46-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
4742

4843
- name: Build and push
4944
uses: docker/build-push-action@v2
@@ -53,11 +48,8 @@ jobs:
5348
build-args: |
5449
VUE_APP_VERSION=v0.0.7-alpha-${{ steps.current-time.outputs.formattedTime }}
5550
tags: |
56-
selfhostedpro/yacht
57-
selfhostedpro/yacht:latest-${{ steps.current-time.outputs.formattedTime }}
58-
selfhostedpro/yacht:v0.0.7-alpha-${{ steps.current-time.outputs.formattedTime }}
59-
ghcr.io/selfhostedpro/yacht
60-
ghcr.io/selfhostedpro/yacht:latest-${{ steps.current-time.outputs.formattedTime }}
61-
ghcr.io/selfhostedpro/yacht:v0.0.7-alpha-${{ steps.current-time.outputs.formattedTime }}
51+
ghcr.io/${{ github.repository_owner }}/yacht
52+
ghcr.io/${{ github.repository_owner }}/yacht:latest-${{ steps.current-time.outputs.formattedTime }}
53+
ghcr.io/${{ github.repository_owner }}/yacht:v0.0.7-alpha-${{ steps.current-time.outputs.formattedTime }}
6254
cache-from: type=local,src=/tmp/.buildx-cache
6355
cache-to: type=local,dest=/tmp/.buildx-cache

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5151
# If this step fails, then you should remove it and run the build manually (see below)
5252
- name: Autobuild
53-
uses: github/codeql-action/autobuild@v1
53+
uses: github/codeql-action/autobuild@v2
5454

5555
# ℹ️ Command-line programs to run using the OS shell.
5656
# 📚 https://git.io/JvXDl

‎.github/workflows/docker-image.yml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ "develop" ]
66

7-
jjobs:
7+
jobs:
88
build:
99
runs-on: ubuntu-latest
1010
steps:
@@ -38,12 +38,6 @@ jjobs:
3838
username: ${{ github.repository_owner }}
3939
password: ${{ secrets.CR_PAT }}
4040

41-
- name: Login to DockerHub
42-
uses: docker/login-action@v1
43-
with:
44-
username: ${{ secrets.DOCKERHUB_USERNAME }}
45-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
46-
4741
- name: Build and push
4842
uses: docker/build-push-action@v2
4943
with:
@@ -52,9 +46,7 @@ jjobs:
5246
build-args: |
5347
VUE_APP_VERSION=devel-${{ steps.current-time.outputs.formattedTime }}
5448
tags: |
55-
selfhostedpro/yacht:devel
56-
selfhostedpro/yacht:devel-${{ steps.current-time.outputs.formattedTime }}
57-
ghcr.io/selfhostedpro/yacht:devel
58-
ghcr.io/selfhostedpro/yacht:devel-${{ steps.current-time.outputs.formattedTime }}
49+
ghcr.io/${{ github.repository_owner }}/yacht:devel
50+
ghcr.io/${{ github.repository_owner }}/yacht:devel-${{ steps.current-time.outputs.formattedTime }}
5951
cache-from: type=local,src=/tmp/.buildx-cache
60-
cache-to: type=local,dest=/tmp/.buildx-cache
52+
cache-to: type=local,dest=/tmp/.buildx-

‎.github/workflows/ghcr-mirror.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: docker/login-action@v1
3939
with:
4040
registry: ${{ github.event.inputs.dest-registry }}
41-
username: selfhostedpro
41+
username: ${{ github.repository_owner }}
4242
password: ${{ secrets.CR_PAT }}
4343
-
4444
name: Mirror ${{ github.event.inputs.dockerhub-repo }} to ${{ github.event.inputs.dest-registry }}/${{ github.event.inputs.dest-repo }}

‎.github/workflows/manual-build.yml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ jobs:
4242
username: ${{ github.repository_owner }}
4343
password: ${{ secrets.CR_PAT }}
4444

45-
- name: Login to DockerHub
46-
uses: docker/login-action@v1
47-
with:
48-
username: ${{ secrets.DOCKERHUB_USERNAME }}
49-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
5045

5146
- name: Build and push
5247
uses: docker/build-push-action@v2
@@ -56,7 +51,6 @@ jobs:
5651
build-args: |
5752
VUE_APP_VERSION=${{ github.event.inputs.release }}
5853
tags: |
59-
selfhostedpro/yacht:${{ github.event.inputs.release }}
60-
ghcr.io/selfhostedpro/yacht:${{ github.event.inputs.release }}
54+
ghcr.io/${{ github.repository_owner }}/yacht:${{ github.event.inputs.release }}
6155
cache-from: type=local,src=/tmp/.buildx-cache
6256
cache-to: type=local,dest=/tmp/.buildx-cache

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ RUN curl -L "https://github.com/docker/compose/releases/download/v2.20.0/docker-
4343
chmod +x /usr/local/bin/docker-compose
4444

4545
# Upgrade pip, setuptools, and wheel
46-
RUN pip3 install --upgrade pip setuptools wheel --break-system-packages
46+
RUN pip3 install --upgrade pip setuptools wheel
4747

4848
# Install Python packages from requirements.txt
49-
RUN pip3 install -r requirements.txt --no-cache-dir --verbose --break-system-packages
49+
RUN pip3 install --use-deprecated=legacy-resolver -r requirements.txt
5050

5151
# Install SASS via gem
5252
RUN gem install sass --verbose

0 commit comments

Comments
 (0)