Merge pull request #2 from FFCoder/fixPipelines

Fix pipelines

.github/workflows/pushToDockerhubOnCommit.yml

@@ -0,0 +1,30 @@
+# This workflow will build a golang project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
+
+name: Build Binaries on Commit
+
+on:
+  push:
+    branches-ignore:
+      - main
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v6.7.0
+        with:
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/kratomtracker:${{ github.sha }}
+

.github/workflows/pushToDockerhubOnMain.yml

@@ -0,0 +1,29 @@
+# This workflow will build a golang project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
+
+name: Build Binaries on Main
+
+on:
+  push:
+    branches: [ "main" ]
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v6.7.0
+        with:
+          context: .
+          file: Dockerfile
+          platforms: linux/amd64
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/kratomtracker:latest
+          push: true
+

Dockerfile

@@ -1,5 +1,5 @@
 # Build stage
-FROM golang:1.22-bullseye as build
+FROM golang:1.22-bullseye AS build
 
 LABEL authors="Jonathon Chambers"
 LABEL description="This is the Dockerfile for setting up the Kratom Tracker Application"

build_prod.sh

@@ -5,6 +5,19 @@ export APP_NAME="kratom_tracker"
 export VITE_API_URL="/api"
 export CGO_ENABLED=1 # Required for sqlite3
 
+# Validate pnpm is installed
+if ! command -v pnpm &> /dev/null
+then
+    echo "pnpm could not be found"
+    echo "attempting to install pnpm"
+    npm install -g pnpm
+    if ! command -v pnpm &> /dev/null
+    then
+        echo "pnpm failed to install"
+        exit 1
+    fi
+fi
+
 # Make the output
 mkdir -p output
 
@@ -14,9 +27,7 @@ rm -rf output/*
 # Build the frontend
 cd frontend || exit 1
 
-# Remove package-lock.json
-rm -f package-lock.json
-#npm install --legacy-peer-deps
+pnpm install
 npm run build:prod
 
 # Build the backend