New workflows for image creation and submission added

Author: Blasetvrtumi

.github/workflows/ImagePushOnMerge.yml

@@ -0,0 +1,30 @@
+name: Docker image creation and push to Dockerhub on merge to main branch
+
+on:
+  push:
+    branches:
+      - main
+jobs:
+
+  create-push:
+    name: Docker Image Build and Push (merge main)
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+      - name: Run create_image script for merge to main
+        working-directory: ./docker
+        env:
+          DOCKERHUB_USER: ${{ secrets.DOCKER_HUB_USERNAME }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+        run: |
+          chmod +x ./create_image.sh
+          ./create_image.sh

.github/workflows/ImagePushOnRelease.yml

@@ -0,0 +1,34 @@
+name: Docker image creation and push to Dockerhub on release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+
+  create-push:
+    name: Docker Image Build and Push (release)
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout release tag
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.release.tag_name }}
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+      - name: Run create_image script for release
+        working-directory: ./docker
+        env:
+          DOCKERHUB_USER: ${{ secrets.DOCKER_HUB_USERNAME }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+          RELEASE_TAG: ${{ github.event.release.tag_name }}
+        run: |
+          chmod +x ./create_image.sh
+          ./create_image.sh release

.github/workflows/manualBuildImagePush.yml

@@ -0,0 +1,29 @@
+name: Manual build Docker Image Push
+on:
+  workflow_dispatch:
+jobs:
+  manual-image-push:
+    name: Manual build Docker Image Push
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+      - name: Run create_image script for manual push
+        working-directory: ./docker
+        env:
+          DOCKERHUB_USER: ${{ secrets.DOCKER_HUB_USERNAME }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+          BRANCH: ${{ github.ref_name }}
+          DATETIME: ${{ github.event.workflow_dispatch.inputs.datetime || '' }}
+          COMMIT_SHA: ${{ github.event.workflow_dispatch.inputs.commit_sha || '' }}
+        run: |
+          chmod +x ./create_image.sh
+          ./create_image.sh build

.gitignore

@@ -113,4 +113,5 @@ replay_pid*
 */Thumbs.db
 
 #OpenAPI
-docs/api/index.html
+docs/api/index.html
+docker/.env

docker/create_image.sh

@@ -1,5 +1,16 @@
 #!/bin/bash
 
+set -euo pipefail
+
+MODE=${1:-dev} # default dev, options dev, release or build
+FILE=""
+DOCKERHUB_USER=${DOCKERHUB_USER:-}
+DOCKERHUB_TOKEN=${DOCKERHUB_TOKEN:-}
+RELEASE_TAG=${RELEASE_TAG:-}
+BRANCH_NAME=${BRANCH:-}
+DATETIME=${DATETIME:-$(date +%Y%m%d%H%M%S)}
+COMMIT=${COMMIT_SHA:-}
+
 # Clear for better debugging of possible errors
 clear
 
@@ -18,11 +29,37 @@ ng build --configuration production
 # Move to docker folder
 cd ../docker
 
-# Build container
-docker build -t blasetvrtumi/rarecips -f Dockerfile ../
+if [ "$MODE" == "release" ] && [ -n "$RELEASE_TAG" ]; then
+
+    # Set release tag
+    MODE=$RELEASE_TAG
+
+    # Set compose file
+    FILE="docker-compose.yml"
+    
+    # Build container
+    docker build -f Dockerfile -t "$DOCKERHUB_USER/rarecips:$MODE" -t "$DOCKERHUB_USER/rarecips:latest" ../
+
+    # Push image latest
+    docker push "$DOCKERHUB_USER/rarecips:latest"
+
+else
+
+    # Set compose file
+    FILE="docker-compose-dev.yml"
+
+    if [ "$MODE" == "build" ]; then
+        # Set mode to datetime-commit
+        MODE="${BRANCH_NAME}-$DATETIME-${COMMIT}"
+    fi
+
+    # Build container
+    docker build -f Dockerfile -t "$DOCKERHUB_USER/rarecips:$MODE" ../
+
+fi
 
-# Push image
-docker push blasetvrtumi/rarecips
+# Push main image
+docker push "$DOCKERHUB_USER/rarecips:$MODE"
 
-# Up compose
-docker-compose -p rarecips up
+# Push OCI compose file
+docker compose -f $FILE -p rarecips publish "$DOCKERHUB_USER/rarecips:$MODE"

docker/docker-compose-dev.yml

@@ -0,0 +1,34 @@
+# In project root:
+# docker pull blasetvrtumi/rarecips
+# cd docker
+# docker-compose -p rarecips up --build
+
+services:
+
+  rarecips-app:
+
+    container_name: rarecips-app
+    image: blasetvrtumi/rarecips:dev
+    ports:
+      - "8443:8443"
+    depends_on:
+      - rarecips-DB
+    command: ["/bin/sh", "-c", "./wait-for-it.sh rarecips-DB:3306 -- && java -jar /app/rarecips-0.0.1-SNAPSHOT.jar"]
+    environment:
+      - SPRING_DATASOURCE_URL=jdbc:mysql://rarecips-DB:3306/rarecips
+      - SPRING_DATASOURCE_USERNAME="${SPRING_DATASOURCE_USERNAME:-root}"
+      - SPRING_DATASOURCE_PASSWORD="${SPRING_DATASOURCE_PASSWORD:-password}"
+
+  rarecips-DB:
+    container_name: rarecips-DB
+    image: mysql:9.0.0
+    ports:
+      - "3306:3306"
+    environment:
+      - MYSQL_DATABASE=rarecips
+      - MYSQL_ROOT_PASSWORD="${MYSQL_ROOT_PASSWORD:-password}"
+    volumes:
+      - /var/lib/mysql
+
+volumes:
+  mysql:

docker/docker-compose.yml

@@ -8,16 +8,16 @@ services:
   rarecips-app:
 
     container_name: rarecips-app
-    image: blasetvrtumi/rarecips
+    image: blasetvrtumi/rarecips:0.1
     ports:
       - "8443:8443"
     depends_on:
       - rarecips-DB
-    command: ["/bin/sh", "-c", "./wait-for-it.sh rarecips-DB:3306 -- && java -jar /app/rarecips-0.0.1-SNAPSHOT.jar"]
+    command: ["/bin/sh", "-c", "./wait-for-it.sh rarecips-DB:3306 -- && java -jar /app/rarecips-0.1-SNAPSHOT.jar"]
     environment:
       - SPRING_DATASOURCE_URL=jdbc:mysql://rarecips-DB:3306/rarecips
-      - SPRING_DATASOURCE_USERNAME=root
-      - SPRING_DATASOURCE_PASSWORD=password
+      - SPRING_DATASOURCE_USERNAME="${SPRING_DATASOURCE_USERNAME:-root}"
+      - SPRING_DATASOURCE_PASSWORD="${SPRING_DATASOURCE_PASSWORD:-password}"
 
   rarecips-DB:
     container_name: rarecips-DB
@@ -26,7 +26,7 @@ services:
       - "3306:3306"
     environment:
       - MYSQL_DATABASE=rarecips
-      - MYSQL_ROOT_PASSWORD=password
+      - MYSQL_ROOT_PASSWORD="${MYSQL_ROOT_PASSWORD:-password}"
     volumes:
       - /var/lib/mysql
 

docker/create_image.bat docker/local_create_image.batdocker/create_image.bat renamed to docker/local_create_image.bat

@@ -15,10 +15,10 @@ REM Move to docker folder
 cd "docker"
 
 REM Build container
-docker "build" "-t" "blasetvrtumi\rarecips" "-f" "Dockerfile" "../"
+docker build -t blasetvrtumi/rarecips:dev -f Dockerfile ../
 
-REM Push image
-docker "push" "blasetvrtumi\rarecips"
+REM Push image to dev tag
+docker push blasetvrtumi/rarecips:dev
 
 REM Up compose
-docker-compose "-p" "rarecips" "up"
+docker compose -f docker-compose-dev.yml -p rarecips up -d

docker/local_create_image.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Clear for better debugging of possible errors
+clear
+
+# Move to angular folder
+cd ../frontend
+
+# Install angular cli globally
+npm install -g @angular/cli
+
+# Install dependencies
+npm install
+
+# Create production build
+ng build --configuration production
+
+# Move to docker folder
+cd ../docker
+
+# Build container
+docker build -t blasetvrtumi/rarecips:dev -f Dockerfile ../
+
+# Push image to dev tag
+docker push blasetvrtumi/rarecips:dev
+
+# Up compose
+docker-compose -f docker-compose-dev.yml -p rarecips up -d

frontend/src/app/services/recipe.service.ts

@@ -5,10 +5,14 @@ import { Recipe } from "../models/recipe.model";
     providedIn: "root"
 })
 export class RecipeService {
+
+    API_URL = "/api/v1/recipes";
+    size = 10;
+
     constructor() { }
 
-    async getRecipes(): Promise<Recipe[]> {
-        const response = await fetch("/api/recipes?order=lastmod&size=4&page=0");
+    async getRecipes(size: number): Promise<Recipe[]> {
+        const response = await fetch(`${this.API_URL}?order=lastmod&size=${size}&page=0`);
         const data = await response.json();
         return data.recipes.map((recipe: any) => ({
             id: recipe.id,
@@ -36,7 +40,7 @@ export class RecipeService {
     }
 
     async getRecipeById(id: number): Promise<Recipe | null> {
-        const response = await fetch(`/api/recipes/${id}`);
+        const response = await fetch(`${this.API_URL}/${id}`);
         if (response.status === 404) {
             return null;
         }