Skip to content

Commit a4533e4

Browse files
Update docker publishing of images
1 parent 53c4191 commit a4533e4

File tree

8 files changed

+15
-19
lines changed

8 files changed

+15
-19
lines changed

.github/workflows/docker.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ jobs:
3030
with:
3131
context: ./client
3232
push: true
33-
tags: ghcr.io/aet-devops25/team-the-merge-doctors/client:latest
33+
tags: ghcr.io/aet-devops25/team-the-merge-doctors/client:${{ github.ref_name }}
3434

3535
- name: Build & push Client image (Kubernetes Production)
3636
uses: docker/build-push-action@v4
3737
with:
3838
context: ./client
3939
push: true
40-
tags: ghcr.io/aet-devops25/team-the-merge-doctors/client-kubernetes-production:latest
40+
tags: ghcr.io/aet-devops25/team-the-merge-doctors/client-kubernetes-production:${{ github.ref_name }}
4141
build-args: |
4242
NODE_ENV=production-kubernetes
4343
@@ -46,32 +46,32 @@ jobs:
4646
with:
4747
context: ./genai
4848
push: true
49-
tags: ghcr.io/aet-devops25/team-the-merge-doctors/genai:latest
49+
tags: ghcr.io/aet-devops25/team-the-merge-doctors/genai:${{ github.ref_name }}
5050

5151
- name: Build & push Ollama image
5252
uses: docker/build-push-action@v4
5353
with:
5454
context: ./genai/ollama
5555
push: true
56-
tags: ghcr.io/aet-devops25/team-the-merge-doctors/ollama:latest
56+
tags: ghcr.io/aet-devops25/team-the-merge-doctors/ollama:${{ github.ref_name }}
5757

5858
- name: Build & push User Service image
5959
uses: docker/build-push-action@v4
6060
with:
6161
context: ./server/userservice
6262
push: true
63-
tags: ghcr.io/aet-devops25/team-the-merge-doctors/server/user-service:latest
63+
tags: ghcr.io/aet-devops25/team-the-merge-doctors/server/user-service:${{ github.ref_name }}
6464

6565
- name: Build & push Mentorship Service image
6666
uses: docker/build-push-action@v4
6767
with:
6868
context: ./server/mentorshipservice
6969
push: true
70-
tags: ghcr.io/aet-devops25/team-the-merge-doctors/server/mentorship-service:latest
70+
tags: ghcr.io/aet-devops25/team-the-merge-doctors/server/mentorship-service:${{ github.ref_name }}
7171

7272
- name: Build & push Rating Service image
7373
uses: docker/build-push-action@v4
7474
with:
7575
context: ./server/ratingservice
7676
push: true
77-
tags: ghcr.io/aet-devops25/team-the-merge-doctors/server/rating-service:latest
77+
tags: ghcr.io/aet-devops25/team-the-merge-doctors/server/rating-service:${{ github.ref_name }}

helm/templates/deployments/client-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: client
18-
image: "{{ .Values.client.image.repository }}:{{ .Values.client.image.tag }}"
18+
image: "{{ .Values.client.image.repository }}:{{ .Values.tag }}"
1919
imagePullPolicy: {{ .Values.client.image.pullPolicy }}
2020
resources:
2121
limits:

helm/templates/deployments/genai-microservice-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: genai-microservice-container
18-
image: "{{ .Values.genaiMicroservice.image.repository }}:{{ .Values.genaiMicroservice.image.tag }}"
18+
image: "{{ .Values.genaiMicroservice.image.repository }}:{{ .Values.tag }}"
1919
imagePullPolicy: {{ .Values.genaiMicroservice.image.pullPolicy }}
2020
resources:
2121
limits:

helm/templates/deployments/mentorship-microservice-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: user-microservice-container
18-
image: "{{ .Values.mentorshipMicroservice.image.repository }}:{{ .Values.mentorshipMicroservice.image.tag }}"
18+
image: "{{ .Values.mentorshipMicroservice.image.repository }}:{{ .Values.tag }}"
1919
imagePullPolicy: {{ .Values.mentorshipMicroservice.image.pullPolicy }}
2020
resources:
2121
limits:

helm/templates/deployments/ollama-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: ollama-container
18-
image: "{{ .Values.ollama.image.repository }}:{{ .Values.ollama.image.tag }}"
18+
image: "{{ .Values.ollama.image.repository }}:{{ .Values.tag }}"
1919
imagePullPolicy: {{ .Values.ollama.image.pullPolicy }}
2020
ports:
2121
- containerPort: {{ .Values.ollama.service.targetPort }}

helm/templates/deployments/rating-microservice-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: user-microservice-container
18-
image: "{{ .Values.ratingMicroservice.image.repository }}:{{ .Values.ratingMicroservice.image.tag }}"
18+
image: "{{ .Values.ratingMicroservice.image.repository }}:{{ .Values.tag }}"
1919
imagePullPolicy: {{ .Values.ratingMicroservice.image.pullPolicy }}
2020
resources:
2121
limits:

helm/templates/deployments/user-microservice-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: user-microservice-container
18-
image: "{{ .Values.userMicroservice.image.repository }}:{{ .Values.userMicroservice.image.tag }}"
18+
image: "{{ .Values.userMicroservice.image.repository }}:{{ .Values.tag }}"
1919
imagePullPolicy: {{ .Values.userMicroservice.image.pullPolicy }}
2020
resources:
2121
limits:

helm/values.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ namespace: team-the-merge-doctors
33
userMicroservice:
44
image:
55
repository: ghcr.io/aet-devops25/team-the-merge-doctors/server/user-service
6-
tag: latest
76
pullPolicy: Always
87
service:
98
type: ClusterIP
@@ -16,7 +15,6 @@ userMicroservice:
1615
mentorshipMicroservice:
1716
image:
1817
repository: ghcr.io/aet-devops25/team-the-merge-doctors/server/mentorship-service
19-
tag: latest
2018
pullPolicy: Always
2119
service:
2220
type: ClusterIP
@@ -29,7 +27,6 @@ mentorshipMicroservice:
2927
ratingMicroservice:
3028
image:
3129
repository: ghcr.io/aet-devops25/team-the-merge-doctors/server/rating-service
32-
tag: latest
3330
pullPolicy: Always
3431
service:
3532
type: ClusterIP
@@ -42,7 +39,6 @@ ratingMicroservice:
4239
genaiMicroservice:
4340
image:
4441
repository: ghcr.io/aet-devops25/team-the-merge-doctors/genai
45-
tag: latest
4642
pullPolicy: Always
4743
service:
4844
type: ClusterIP
@@ -55,7 +51,6 @@ genaiMicroservice:
5551
client:
5652
image:
5753
repository: ghcr.io/aet-devops25/team-the-merge-doctors/client-kubernetes-production
58-
tag: latest
5954
pullPolicy: Always
6055
service:
6156
type: ClusterIP
@@ -83,7 +78,6 @@ ingress:
8378
ollama:
8479
image:
8580
repository: ghcr.io/aet-devops25/team-the-merge-doctors/ollama
86-
tag: latest
8781
pullPolicy: Always
8882
service:
8983
type: ClusterIP
@@ -93,6 +87,8 @@ ollama:
9387
selector: ollama-selector
9488
replicaCount: 1
9589

90+
tag: latest
91+
9692
secrets:
9793
postgresUser: postgres
9894
postgresPassword: postgres_password

0 commit comments

Comments
 (0)