real image pushing

Author: coilysiren

.github/workflows/build-and-publish.yml

@@ -23,6 +23,7 @@ jobs:
       - run: docker push ghcr.io/${{ github.repository }}/coilysiren-backend:${{ github.sha }}
   deploy:
     runs-on: ubuntu-latest
+    needs: build-publish
     steps:
       - uses: actions/checkout@v4
       - uses: tailscale/github-action@v3
@@ -59,4 +60,4 @@ jobs:
               client-certificate-data: ${{ secrets.K8S_CLIENT_CERT_DATA }}
               client-key-data: ${{ secrets.K8S_CLIENT_KEY_DATA }}
           EOF
-      - run: kubectl get pods --all-namespaces
+      - run: make .deploy

Makefile

@@ -7,11 +7,14 @@ DEFAULT_GOAL := help
 # So only put fast commands up here.
 
 dns-name ?= $(shell cat config.yml | yq e '.dns-name')
-dns-dashed ?= $(subst .,-,$(dns-name))
 email ?= $(shell cat config.yml | yq e '.email')
 name ?= $(shell cat config.yml | yq e '.name')
 name-dashed ?= $(subst /,-,$(name))
-hash ?= $(shell git rev-parse HEAD)
+git-hash ?= $(shell git rev-parse HEAD)
+image-url ?= ghcr.io/$(name)/$(name-dashed):$(git-hash)
+
+echo:
+	echo $(image-url)
 
 help:
 	@awk '/^## / \
@@ -80,8 +83,7 @@ deploy-secrets-cert:
 	env \
 		NAME=$(name-dashed) \
 		DNS_NAME=$(dns-name) \
-		DNS_DASHED=$(dns-dashed) \
-		EMAIL=$(email) \
+		IMAGE=$(image-url) \
 		envsubst < deploy/main.yml | kubectl apply -f -
 
 ## deploy the application to the cluster

deploy/main.yml

@@ -16,10 +16,14 @@ spec:
     spec:
       containers:
         - name: ${NAME}
-          image: nginx # temporary
+          image: ${IMAGE}
+          resources:
+            limits:
+              cpu: 1000m
+              memory: 256Mi
           env:
-            # - name: PORT
-            #   value: "80"
+            - name: PORT
+              value: "80"
             # - name: BSKY_USERNAME
             #   valueFrom:
             #     secretKeyRef: