feat: add Helm chart and switch image builds to DOCR
- Add chart/ with backend, frontend, valkey deployments, services, and ingress - Update nginx.conf to use BACKEND_URL env var via envsubst - Update Dockerfile.frontend to use nginx template mechanism - Build.yml: switch Docker registry from Gitea to DOCR, add helm package+push step
This commit is contained in:
@@ -14,7 +14,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: "!startsWith(github.event.head_commit.message, 'chore: bump version')"
|
if: "!startsWith(github.event.head_commit.message, 'chore: bump version')"
|
||||||
env:
|
env:
|
||||||
REGISTRY: git2.lunarfront.tech
|
REGISTRY: registry.digitalocean.com/lunarfront
|
||||||
GIT_REMOTE: git2.lunarfront.tech
|
GIT_REMOTE: git2.lunarfront.tech
|
||||||
DOCKER_HOST: tcp://localhost:2375
|
DOCKER_HOST: tcp://localhost:2375
|
||||||
|
|
||||||
@@ -53,8 +53,8 @@ jobs:
|
|||||||
")
|
")
|
||||||
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Login to registry
|
- name: Login to DOCR
|
||||||
run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login $REGISTRY -u ryan --password-stdin
|
run: echo "${{ secrets.DOCR_TOKEN }}" | docker login registry.digitalocean.com -u token --password-stdin
|
||||||
|
|
||||||
- name: Build and push backend
|
- name: Build and push backend
|
||||||
run: |
|
run: |
|
||||||
@@ -62,26 +62,42 @@ jobs:
|
|||||||
SHA=$(git rev-parse --short HEAD)
|
SHA=$(git rev-parse --short HEAD)
|
||||||
docker build \
|
docker build \
|
||||||
--build-arg APP_VERSION=$VERSION \
|
--build-arg APP_VERSION=$VERSION \
|
||||||
-t $REGISTRY/ryan/lunarfront-app:$VERSION \
|
-t $REGISTRY/lunarfront-app:$VERSION \
|
||||||
-t $REGISTRY/ryan/lunarfront-app:$SHA \
|
-t $REGISTRY/lunarfront-app:$SHA \
|
||||||
-t $REGISTRY/ryan/lunarfront-app:latest \
|
-t $REGISTRY/lunarfront-app:latest \
|
||||||
-f Dockerfile .
|
-f Dockerfile .
|
||||||
docker push $REGISTRY/ryan/lunarfront-app:$VERSION
|
docker push $REGISTRY/lunarfront-app:$VERSION
|
||||||
docker push $REGISTRY/ryan/lunarfront-app:$SHA
|
docker push $REGISTRY/lunarfront-app:$SHA
|
||||||
docker push $REGISTRY/ryan/lunarfront-app:latest
|
docker push $REGISTRY/lunarfront-app:latest
|
||||||
|
|
||||||
- name: Build and push frontend
|
- name: Build and push frontend
|
||||||
run: |
|
run: |
|
||||||
VERSION=${{ steps.version.outputs.version }}
|
VERSION=${{ steps.version.outputs.version }}
|
||||||
SHA=$(git rev-parse --short HEAD)
|
SHA=$(git rev-parse --short HEAD)
|
||||||
docker build \
|
docker build \
|
||||||
-t $REGISTRY/ryan/lunarfront-frontend:$VERSION \
|
-t $REGISTRY/lunarfront-frontend:$VERSION \
|
||||||
-t $REGISTRY/ryan/lunarfront-frontend:$SHA \
|
-t $REGISTRY/lunarfront-frontend:$SHA \
|
||||||
-t $REGISTRY/ryan/lunarfront-frontend:latest \
|
-t $REGISTRY/lunarfront-frontend:latest \
|
||||||
-f Dockerfile.frontend .
|
-f Dockerfile.frontend .
|
||||||
docker push $REGISTRY/ryan/lunarfront-frontend:$VERSION
|
docker push $REGISTRY/lunarfront-frontend:$VERSION
|
||||||
docker push $REGISTRY/ryan/lunarfront-frontend:$SHA
|
docker push $REGISTRY/lunarfront-frontend:$SHA
|
||||||
docker push $REGISTRY/ryan/lunarfront-frontend:latest
|
docker push $REGISTRY/lunarfront-frontend:latest
|
||||||
|
|
||||||
|
- name: Install Helm
|
||||||
|
run: |
|
||||||
|
curl -fsSL https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
|
||||||
|
|
||||||
|
- name: Package and push Helm chart
|
||||||
|
run: |
|
||||||
|
VERSION=${{ steps.version.outputs.version }}
|
||||||
|
# Update chart version to match app version
|
||||||
|
sed -i "s/^version:.*/version: $VERSION/" chart/Chart.yaml
|
||||||
|
sed -i "s/^appVersion:.*/appVersion: \"$VERSION\"/" chart/Chart.yaml
|
||||||
|
# Update default image tags in values.yaml to this version
|
||||||
|
sed -i "s|tag: latest|tag: $VERSION|g" chart/values.yaml
|
||||||
|
helm registry login registry.digitalocean.com -u token --password "${{ secrets.DOCR_TOKEN }}"
|
||||||
|
helm package chart/
|
||||||
|
helm push lunarfront-$VERSION.tgz oci://registry.digitalocean.com/lunarfront
|
||||||
|
|
||||||
- name: Commit version bump
|
- name: Commit version bump
|
||||||
run: |
|
run: |
|
||||||
@@ -95,4 +111,4 @@ jobs:
|
|||||||
|
|
||||||
- name: Logout
|
- name: Logout
|
||||||
if: always()
|
if: always()
|
||||||
run: docker logout $REGISTRY
|
run: docker logout registry.digitalocean.com
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ RUN bun run build
|
|||||||
|
|
||||||
FROM nginx:alpine
|
FROM nginx:alpine
|
||||||
COPY --from=build /app/packages/admin/dist /usr/share/nginx/html
|
COPY --from=build /app/packages/admin/dist /usr/share/nginx/html
|
||||||
COPY nginx.conf /etc/nginx/conf.d/default.conf
|
# nginx docker image processes templates in /etc/nginx/templates/ with envsubst at startup
|
||||||
|
COPY nginx.conf /etc/nginx/templates/default.conf.template
|
||||||
|
ENV BACKEND_URL=http://localhost:8000
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
CMD ["nginx", "-g", "daemon off;"]
|
CMD ["nginx", "-g", "daemon off;"]
|
||||||
|
|||||||
6
chart/Chart.yaml
Normal file
6
chart/Chart.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
apiVersion: v2
|
||||||
|
name: lunarfront
|
||||||
|
description: LunarFront small business management platform
|
||||||
|
type: application
|
||||||
|
version: 0.1.0
|
||||||
|
appVersion: "0.0.0"
|
||||||
8
chart/templates/_helpers.tpl
Normal file
8
chart/templates/_helpers.tpl
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
{{- define "lunarfront.name" -}}
|
||||||
|
{{- .Release.Name }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
{{- define "lunarfront.labels" -}}
|
||||||
|
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||||
|
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||||
|
{{- end }}
|
||||||
59
chart/templates/backend-deployment.yaml
Normal file
59
chart/templates/backend-deployment.yaml
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: {{ .Release.Name }}-backend
|
||||||
|
namespace: {{ .Release.Namespace }}
|
||||||
|
labels:
|
||||||
|
{{- include "lunarfront.labels" . | nindent 4 }}
|
||||||
|
spec:
|
||||||
|
replicas: 1
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app: {{ .Release.Name }}-backend
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: {{ .Release.Name }}-backend
|
||||||
|
spec:
|
||||||
|
imagePullSecrets:
|
||||||
|
{{- toYaml .Values.imagePullSecrets | nindent 8 }}
|
||||||
|
containers:
|
||||||
|
- name: backend
|
||||||
|
image: "{{ .Values.backend.image.repository }}:{{ .Values.backend.image.tag }}"
|
||||||
|
imagePullPolicy: {{ .Values.backend.image.pullPolicy }}
|
||||||
|
ports:
|
||||||
|
- containerPort: {{ .Values.backend.port }}
|
||||||
|
env:
|
||||||
|
- name: PORT
|
||||||
|
value: {{ .Values.backend.port | quote }}
|
||||||
|
- name: NODE_ENV
|
||||||
|
value: production
|
||||||
|
- name: DATABASE_URL
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: lunarfront-secrets
|
||||||
|
key: database-url
|
||||||
|
- name: REDIS_URL
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: lunarfront-secrets
|
||||||
|
key: redis-url
|
||||||
|
- name: JWT_SECRET
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: lunarfront-secrets
|
||||||
|
key: jwt-secret
|
||||||
|
livenessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /v1/health
|
||||||
|
port: {{ .Values.backend.port }}
|
||||||
|
initialDelaySeconds: 15
|
||||||
|
periodSeconds: 30
|
||||||
|
readinessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /v1/health
|
||||||
|
port: {{ .Values.backend.port }}
|
||||||
|
initialDelaySeconds: 5
|
||||||
|
periodSeconds: 10
|
||||||
|
resources:
|
||||||
|
{{- toYaml .Values.backend.resources | nindent 12 }}
|
||||||
13
chart/templates/backend-service.yaml
Normal file
13
chart/templates/backend-service.yaml
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: {{ .Release.Name }}-backend
|
||||||
|
namespace: {{ .Release.Namespace }}
|
||||||
|
labels:
|
||||||
|
{{- include "lunarfront.labels" . | nindent 4 }}
|
||||||
|
spec:
|
||||||
|
selector:
|
||||||
|
app: {{ .Release.Name }}-backend
|
||||||
|
ports:
|
||||||
|
- port: {{ .Values.backend.port }}
|
||||||
|
targetPort: {{ .Values.backend.port }}
|
||||||
30
chart/templates/frontend-deployment.yaml
Normal file
30
chart/templates/frontend-deployment.yaml
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: {{ .Release.Name }}-frontend
|
||||||
|
namespace: {{ .Release.Namespace }}
|
||||||
|
labels:
|
||||||
|
{{- include "lunarfront.labels" . | nindent 4 }}
|
||||||
|
spec:
|
||||||
|
replicas: 1
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app: {{ .Release.Name }}-frontend
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: {{ .Release.Name }}-frontend
|
||||||
|
spec:
|
||||||
|
imagePullSecrets:
|
||||||
|
{{- toYaml .Values.imagePullSecrets | nindent 8 }}
|
||||||
|
containers:
|
||||||
|
- name: frontend
|
||||||
|
image: "{{ .Values.frontend.image.repository }}:{{ .Values.frontend.image.tag }}"
|
||||||
|
imagePullPolicy: {{ .Values.frontend.image.pullPolicy }}
|
||||||
|
ports:
|
||||||
|
- containerPort: {{ .Values.frontend.port }}
|
||||||
|
env:
|
||||||
|
- name: BACKEND_URL
|
||||||
|
value: "http://{{ .Release.Name }}-backend:{{ .Values.backend.port }}"
|
||||||
|
resources:
|
||||||
|
{{- toYaml .Values.frontend.resources | nindent 12 }}
|
||||||
13
chart/templates/frontend-service.yaml
Normal file
13
chart/templates/frontend-service.yaml
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: {{ .Release.Name }}-frontend
|
||||||
|
namespace: {{ .Release.Namespace }}
|
||||||
|
labels:
|
||||||
|
{{- include "lunarfront.labels" . | nindent 4 }}
|
||||||
|
spec:
|
||||||
|
selector:
|
||||||
|
app: {{ .Release.Name }}-frontend
|
||||||
|
ports:
|
||||||
|
- port: 80
|
||||||
|
targetPort: {{ .Values.frontend.port }}
|
||||||
29
chart/templates/ingress.yaml
Normal file
29
chart/templates/ingress.yaml
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
{{- if .Values.ingress.host }}
|
||||||
|
apiVersion: networking.k8s.io/v1
|
||||||
|
kind: Ingress
|
||||||
|
metadata:
|
||||||
|
name: {{ .Release.Name }}
|
||||||
|
namespace: {{ .Release.Namespace }}
|
||||||
|
labels:
|
||||||
|
{{- include "lunarfront.labels" . | nindent 4 }}
|
||||||
|
annotations:
|
||||||
|
kubernetes.io/ingress.class: {{ .Values.ingress.className }}
|
||||||
|
cert-manager.io/cluster-issuer: {{ .Values.ingress.tlsIssuer }}
|
||||||
|
spec:
|
||||||
|
ingressClassName: {{ .Values.ingress.className }}
|
||||||
|
tls:
|
||||||
|
- hosts:
|
||||||
|
- {{ .Values.ingress.host }}
|
||||||
|
secretName: {{ .Release.Name }}-tls
|
||||||
|
rules:
|
||||||
|
- host: {{ .Values.ingress.host }}
|
||||||
|
http:
|
||||||
|
paths:
|
||||||
|
- path: /
|
||||||
|
pathType: Prefix
|
||||||
|
backend:
|
||||||
|
service:
|
||||||
|
name: {{ .Release.Name }}-frontend
|
||||||
|
port:
|
||||||
|
number: 80
|
||||||
|
{{- end }}
|
||||||
24
chart/templates/valkey-deployment.yaml
Normal file
24
chart/templates/valkey-deployment.yaml
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: {{ .Release.Name }}-valkey
|
||||||
|
namespace: {{ .Release.Namespace }}
|
||||||
|
labels:
|
||||||
|
{{- include "lunarfront.labels" . | nindent 4 }}
|
||||||
|
spec:
|
||||||
|
replicas: 1
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app: {{ .Release.Name }}-valkey
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: {{ .Release.Name }}-valkey
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: valkey
|
||||||
|
image: "{{ .Values.valkey.image.repository }}:{{ .Values.valkey.image.tag }}"
|
||||||
|
ports:
|
||||||
|
- containerPort: {{ .Values.valkey.port }}
|
||||||
|
resources:
|
||||||
|
{{- toYaml .Values.valkey.resources | nindent 12 }}
|
||||||
13
chart/templates/valkey-service.yaml
Normal file
13
chart/templates/valkey-service.yaml
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: {{ .Release.Name }}-valkey
|
||||||
|
namespace: {{ .Release.Namespace }}
|
||||||
|
labels:
|
||||||
|
{{- include "lunarfront.labels" . | nindent 4 }}
|
||||||
|
spec:
|
||||||
|
selector:
|
||||||
|
app: {{ .Release.Name }}-valkey
|
||||||
|
ports:
|
||||||
|
- port: {{ .Values.valkey.port }}
|
||||||
|
targetPort: {{ .Values.valkey.port }}
|
||||||
52
chart/values.yaml
Normal file
52
chart/values.yaml
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
backend:
|
||||||
|
image:
|
||||||
|
repository: registry.digitalocean.com/lunarfront/lunarfront-app
|
||||||
|
tag: latest
|
||||||
|
pullPolicy: Always
|
||||||
|
port: 8000
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
cpu: 100m
|
||||||
|
memory: 256Mi
|
||||||
|
limits:
|
||||||
|
cpu: 1000m
|
||||||
|
memory: 512Mi
|
||||||
|
|
||||||
|
frontend:
|
||||||
|
image:
|
||||||
|
repository: registry.digitalocean.com/lunarfront/lunarfront-frontend
|
||||||
|
tag: latest
|
||||||
|
pullPolicy: Always
|
||||||
|
port: 80
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
cpu: 50m
|
||||||
|
memory: 64Mi
|
||||||
|
limits:
|
||||||
|
cpu: 200m
|
||||||
|
memory: 128Mi
|
||||||
|
|
||||||
|
valkey:
|
||||||
|
image:
|
||||||
|
repository: valkey/valkey
|
||||||
|
tag: "8"
|
||||||
|
port: 6379
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
cpu: 50m
|
||||||
|
memory: 64Mi
|
||||||
|
limits:
|
||||||
|
cpu: 200m
|
||||||
|
memory: 128Mi
|
||||||
|
|
||||||
|
ingress:
|
||||||
|
host: ""
|
||||||
|
className: nginx
|
||||||
|
tlsIssuer: letsencrypt
|
||||||
|
|
||||||
|
imagePullSecrets:
|
||||||
|
- name: registry-lunarfront
|
||||||
|
|
||||||
|
# Secrets are expected to exist in-namespace as 'lunarfront-secrets' with keys:
|
||||||
|
# database-url, jwt-secret, redis-url
|
||||||
|
# These are created by the manager during provisioning, not by this chart.
|
||||||
@@ -3,9 +3,9 @@ server {
|
|||||||
root /usr/share/nginx/html;
|
root /usr/share/nginx/html;
|
||||||
index index.html;
|
index index.html;
|
||||||
|
|
||||||
# Proxy API and WebDAV to backend
|
# Proxy API and WebDAV to backend — BACKEND_URL injected at runtime via envsubst
|
||||||
location /v1/ {
|
location /v1/ {
|
||||||
proxy_pass http://localhost:8000;
|
proxy_pass ${BACKEND_URL};
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
@@ -14,7 +14,7 @@ server {
|
|||||||
}
|
}
|
||||||
|
|
||||||
location /webdav/ {
|
location /webdav/ {
|
||||||
proxy_pass http://localhost:8000;
|
proxy_pass ${BACKEND_URL};
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
|||||||
Reference in New Issue
Block a user