Skip to content

Commit d294efd

Browse files
committed
Merge branch 'v6' into v7
# Conflicts: # .github/workflows/docker.build.yaml
2 parents e375ea4 + fa14dc4 commit d294efd

File tree

1 file changed

+29
-11
lines changed

1 file changed

+29
-11
lines changed

Diff for: .github/workflows/docker.build.yaml

+29-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build Docker Image
1+
name: Build
22
on:
33
schedule:
44
- cron: '30 11 * * *'
@@ -14,12 +14,12 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v4
1616
with:
17-
ref: 'main'
17+
ref: main
1818
fetch-depth: 100
1919

2020
- name: Determine latest version
2121
id: latest_version
22-
uses: flownative/action-git-latest-release@1
22+
uses: flownative/action-git-latest-release@v1
2323

2424
- run: |
2525
sudo chmod -R ugo+rwX . && shopt -s dotglob && rm -rf *
@@ -37,6 +37,7 @@ jobs:
3737
latest=true
3838
images: |
3939
flownative/redis
40+
harbor.flownative.io/beach/redis
4041
europe-docker.pkg.dev/flownative/docker/redis
4142
labels: |
4243
org.opencontainers.image.title=Redis
@@ -53,8 +54,7 @@ jobs:
5354
id: qemu
5455
uses: docker/setup-qemu-action@v3
5556

56-
-
57-
name: Set up Docker Buildx
57+
- name: Set up Docker Buildx
5858
id: buildx
5959
uses: docker/setup-buildx-action@v3
6060

@@ -71,6 +71,13 @@ jobs:
7171
username: '_json_key'
7272
password: ${{ secrets.GOOGLE_ARTIFACTS_PASSWORD_DOCKER }}
7373

74+
- name: Login to Harbor
75+
uses: docker/login-action@v3
76+
with:
77+
registry: harbor.flownative.io
78+
username: ${{ secrets.HARBOR_BEACH_USERNAME }}
79+
password: ${{ secrets.HARBOR_BEACH_PASSWORD }}
80+
7481
- name: Build Docker image
7582
uses: docker/build-push-action@v6
7683
with:
@@ -91,22 +98,33 @@ jobs:
9198

9299
release-helm:
93100
runs-on: ubuntu-latest
101+
needs: build
102+
permissions:
103+
contents: write
104+
packages: write
94105
steps:
95106
- uses: actions/checkout@v4
96107
with:
97-
ref: main
108+
ref: 'main'
109+
fetch-depth: 100
98110

99111
- name: Determine latest version
100112
id: latest_version
101113
uses: flownative/action-git-latest-release@1
102114

103-
- name: Release Helm chart
104-
uses: flownative/action-helm-release@v2
115+
- name: Configure Git
116+
run: |
117+
git config user.name "$GITHUB_ACTOR"
118+
git config user.email "[email protected]"
119+
120+
- name: Release Helm chart (Harbor)
121+
uses: flownative/[email protected]
105122
with:
106123
charts_folder: 'Helm'
107124
chart_name: 'redis'
108125
chart_version: ${{ steps.latest_version.outputs.tag }}
109126
app_version: ${{ steps.latest_version.outputs.tag }}
110-
repository_url: 'https://charts.flownative.io'
111-
repository_user: '${{ secrets.CHARTMUSEUM_USER }}'
112-
repository_password: '${{ secrets.CHARTMUSEUM_PASSWORD }}'
127+
registry_host: 'harbor.flownative.io'
128+
repository_path: 'beach-charts'
129+
repository_user: ${{ secrets.HARBOR_BEACH_CHARTS_USERNAME }}
130+
repository_password: ${{ secrets.HARBOR_BEACH_CHARTS_PASSWORD }}

0 commit comments

Comments
 (0)