Fix deployment issues

ldtteam · Nov 11, 2024 · 785a180 · 785a180
1 parent e722c74
commit 785a180
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -12,9 +12,6 @@ on:
       - 'master'
     tags:
       - 'v*'
-  pull_request:
-    branches:
-      - 'master'
 
 env:
   # Use docker.io for Docker Hub if empty
@@ -46,6 +43,8 @@ jobs:
           GIT_API_TAGGING: false
 
   publish:
+    needs:
+      - tag
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -82,11 +81,10 @@ jobs:
           context: .
           file: LDTTeam.Authentication.Server/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ needs.tag.outputs.tag }}
           labels: ${{ steps.meta.outputs.labels }}
 
   chart:
-    if: github.event_name != 'pull_request'
     needs:
       - tag
     permissions:

diff --git a/Charts/ldtteam-authentication-server/templates/deployment.yaml b/Charts/ldtteam-authentication-server/templates/deployment.yaml
@@ -35,7 +35,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.Version }}"
+          image: "{{ .Values.image.repository }}:v{{ .Values.image.version | default .Chart.Version }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http

diff --git a/Charts/ldtteam-authentication-server/values.yaml b/Charts/ldtteam-authentication-server/values.yaml
@@ -3,7 +3,7 @@ replicaCount: 1
 image:
   repository: ghcr.io/ldtteam/authentication
   pullPolicy: IfNotPresent
-  tag: master
+  #tag: ""
 
 imagePullSecrets: []
 nameOverride: ""

diff --git a/LDTTeam.Authentication.Server/LDTTeam.Authentication.Server.csproj b/LDTTeam.Authentication.Server/LDTTeam.Authentication.Server.csproj
@@ -8,6 +8,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluffySpoon.AspNet.LetsEncrypt" Version="1.163.0" />
+        <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
         <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.8" />
         <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.8" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.5">