Merge branch 'main' into remove-docker-compose-folder

.github/workflows/build-images-on-commit.yml

@@ -6,6 +6,7 @@ on:
     paths:
       - "src/loaders/**"
       - "src/services/**"
+      - "src/databases/**"
       - ".version"
       - ".github/workflows/reusable-build-container-images.yml"
       - ".github/workflows/build-images-on-commit.yml"

.github/workflows/build-images-on-pr.yml

@@ -6,6 +6,7 @@ on:
     paths:
       - "src/loaders/**"
       - "src/services/**"
+      - "src/databases/**"
       - ".version"
       - ".github/workflows/reusable-build-container-images.yml"
       - ".github/workflows/check.yml"

.github/workflows/reusable-build-container-images.yml

@@ -22,6 +22,10 @@ jobs:
             name: loaders-curl
           - context: ./src/services/java
             name: services-java
+          - context: ./src/services/nodejs
+            name: services-nodejs
+          - context: ./src/databases/mysql
+            name: databases-mysql
     steps:
       - name: Checkout
         uses: actions/[email protected]

.gitignore

@@ -1,9 +1,4 @@
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-!.vscode/*.code-snippets
+.vscode/
 
 # Local History for Visual Studio Code
 .history/

scripts/build.sh

@@ -56,6 +56,15 @@ for DIR in "${REPO_DIR}/src/services"/*; do
 	fi
 done
 
+for DIR in "${REPO_DIR}/src/databases"/*; do
+	if [ -d "$DIR" ]; then
+		IMAGE_TAG="${REPO_PREFIX}/${IMAGE_PREFIX}-databases-$(basename "$DIR"):$VERSION"
+		echo "Building $IMAGE_TAG..."
+		echo "Running 'docker buildx build --platform $PLATFORM -t $IMAGE_TAG $DIR $PUSH'"
+		docker buildx build --platform "$PLATFORM" -t "$IMAGE_TAG" $PUSH "$DIR" $PUSH
+	fi
+done
+
 for DIR in "${REPO_DIR}/src/loaders"/*; do
 	if [ -d "$DIR" ]; then
 		IMAGE_TAG="${REPO_PREFIX}/${IMAGE_PREFIX}-loaders-$(basename "$DIR"):$VERSION"
@@ -64,3 +73,4 @@ for DIR in "${REPO_DIR}/src/loaders"/*; do
 		docker buildx build --platform "$PLATFORM" -t "$IMAGE_TAG" $PUSH "$DIR" $PUSH
 	fi
 done
+

src/databases/mysql/Dockerfile

@@ -0,0 +1,9 @@
+FROM mysql:5.7
+
+LABEL org.opencontainers.image.source=https://github.com/cisco-open/app-simulator
+LABEL org.opencontainers.image.description="mysql database for app-simulator"
+LABEL org.opencontainers.image.licenses=BSD-3-Clause
+
+RUN yum install -y php-cli && yum clean all
+COPY setup.php /tmp/
+COPY setup.sh /docker-entrypoint-initdb.d/

src/databases/mysql/setup.php

@@ -0,0 +1,33 @@
+<?php
+echo "Setup ...".PHP_EOL;
+
+$config = json_decode($_SERVER['APP_CONFIG']);
+
+$result = "";
+
+foreach($config->databases as $database => $tables) {
+  $result .= "CREATE DATABASE ".$database.";".PHP_EOL;
+  $result .= "USE ".$database.";".PHP_EOL;
+  foreach($tables as $table => $columns) {
+    $result .="CREATE TABLE ".$table." (".PHP_EOL;
+    foreach($columns as $column) {
+      if($column === 'id') {
+        $result .= "  ".$column." INT(6) UNSIGNED AUTO_INCREMENT PRIMARY KEY,".PHP_EOL;
+      } else {
+        $result .= "  ".$column. " VARCHAR(255),".PHP_EOL;
+      }
+    }
+
+    $result = substr($result,0,-2).PHP_EOL;
+
+    $result .=') ENGINE=InnoDB;'.PHP_EOL;
+  }
+}
+
+echo '=====.PHP_EOL';
+
+echo $result;
+
+echo '=====.PHP_EOL';
+
+file_put_contents("/tmp/create.sql",$result);

src/databases/mysql/setup.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+APP_CONFIG="$(</config.json)" php /tmp/setup.php
+mysql -uroot -p${MYSQL_ROOT_PASSWORD} < /tmp/create.sql

src/loaders/curl/Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:3.20.3
 
-LABEL org.opencontainers.image.source https://github.com/cisco-open/app-simulator
+LABEL org.opencontainers.image.source=https://github.com/cisco-open/app-simulator
 LABEL org.opencontainers.image.description="curl loader for app-simulator"
 LABEL org.opencontainers.image.licenses=BSD-3-Clause
 

src/services/java/Dockerfile

@@ -6,7 +6,7 @@ RUN mvn -f /home/app/pom.xml clean package
 
 FROM openjdk:11-jre
 
-LABEL org.opencontainers.image.source https://github.com/cisco-open/app-simulator
+LABEL org.opencontainers.image.source=https://github.com/cisco-open/app-simulator
 LABEL org.opencontainers.image.description="java service for app-simulator"
 LABEL org.opencontainers.image.licenses=BSD-3-Clause
 

src/services/nodejs/.dockerignore

@@ -0,0 +1,4 @@
+node_modules
+npm-debug.log
+package-lock.json
+run.sh

src/services/nodejs/.gitignore

@@ -0,0 +1,4 @@
+node_modules
+npm-debug.log
+package-lock.json
+node.log

src/services/nodejs/Dockerfile

@@ -0,0 +1,13 @@
+FROM node:18
+
+LABEL org.opencontainers.image.source=https://github.com/cisco-open/app-simulator
+LABEL org.opencontainers.image.description="nodejs service for app-simulator"
+LABEL org.opencontainers.image.licenses=BSD-3-Clause
+
+WORKDIR /app
+COPY package*.json ./
+RUN npm install
+COPY . .
+RUN chmod +x /app/entrypoint.sh
+EXPOSE 80
+CMD ["/app/entrypoint.sh"]

src/services/nodejs/entrypoint.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+echo "Running server on :8080"
+APP_CONFIG="$(</config.json)" node index.js 8080
+#fi