Merge branch 'main' into use-docker-metadata-action

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

@@ -4,9 +4,11 @@ on:
   push:
     branches: [main]
     paths:
-      - 'src/loaders/**'
-      - 'src/services/**'
-      - '.version'
+      - "src/loaders/**"
+      - "src/services/**"
+      - ".version"
+      - ".github/workflows/reusable-build-container-images.yml"
+      - ".github/workflows/build-images-on-commit.yml"
   workflow_dispatch:
 jobs:
   build:

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

@@ -9,7 +9,7 @@ on:
         type: boolean
       registry_ghcr:
         description: github container registry
-        default: 'ghcr.io/cisco-open/app-simulator'
+        default: "ghcr.io/cisco-open/app-simulator"
         required: false
         type: string
 jobs:
@@ -20,6 +20,8 @@ jobs:
         image:
           - context: ./src/loaders/curl
             name: loaders-curl
+          - context: ./src/services/java
+            name: services-java
     steps:
       - name: Checkout
         uses: actions/[email protected]

examples/docker-compose/backend-db.json

@@ -0,0 +1,8 @@
+{
+    "type": "mysql",
+    "name": "backend-db",
+    "databases": {
+        "carts": ["id", "name", "total"]
+    }
+  }
+

examples/docker-compose/backend.json

@@ -0,0 +1,15 @@
+{
+  "type": "java",
+  "endpoints": {
+    "http": {
+      "/cart/checkout": [
+        "sleep,1000",
+        "sql://backend-db/?query=SELECT * from carts",
+        ["http://ext-payment-1:8080/pay", "http://ext-payment-2:8080/pay"]
+      ],
+      "/cart/add": ["sql://backend-db/?query=SELECT * from carts"],
+      "error": [{ "call": "error,500,Cart not found", "probability": 0.5 }]
+    }
+  },
+  "name": "backend"
+}

examples/docker-compose/docker-compose.yml

@@ -0,0 +1,53 @@
+services:
+  frontend:
+    image: ghcr.io/cisco-open/app-simulator-services-java:latest
+    build:
+      context: ../../src/services/java
+      dockerfile: Dockerfile
+    ports:
+      - "8080:8080"
+    volumes:
+      - ./frontend.json:/config.json
+  backend:
+    image: ghcr.io/cisco-open/app-simulator-services-java:latest
+    build:
+      context: ../../src/services/java
+      dockerfile: Dockerfile
+    ports:
+      - "8090:8080"
+    volumes:
+      - ./backend.json:/config.json
+  ext-payment:
+    image: ghcr.io/cisco-open/app-simulator-services-java:latest
+    build:
+      context: ../../src/services/java
+      dockerfile: Dockerfile
+    ports:
+      - "8091:8080"
+    volumes:
+      - ./ext-payment.json:/config.json
+    networks:
+      default:
+        aliases:
+          - ext-payment-1
+          - ext-payment-2
+  loader:
+    image: ghcr.io/cisco-open/app-simulator-loaders-curl:latest
+    build:
+      context: ../../src/loaders/curl
+      dockerfile: Dockerfile
+    environment:
+      - URLS=https://frontend:8080/addtocart http://frontend:8080/checkout
+      - SLEEP=5
+      - WAIT=1
+#  backend-db:
+#    image: ghcr.io/cisco-open/app-simulator-databases-mysql:latest
+#    build:
+#      context: ../src/databases/mysql
+#      dockerfile: Dockerfile
+#    ports:
+#      - "3306:3306"
+#    volumes:
+#     - ./backend-db.json:/config.json
+networks:
+  default:

examples/docker-compose/ext-payment.json

@@ -0,0 +1,13 @@
+{
+  "type": "java",
+  "endpoints": {
+    "http": {
+      "/pay": [
+        "sleep,50",
+        "log,warn,do some logging",
+        "log,more logging",
+      ]
+    }
+  },
+  "name": "ext-payment"
+}

examples/frontend.json → examples/docker-compose/frontend.json

@@ -1,5 +1,5 @@
 {
-  "type": "nodejs",
+  "type": "java",
   "options": {
     "connectionDelay": 500,
     "httpLibrary": "request-promise"
@@ -9,7 +9,7 @@
       "/logo.png": ["sleep,1000"],
       "/script.js": ["sleep,5000"],
       "/checkout": [
-        "http://backend/cart/checkout",
+        "http://backend:8080/cart/checkout",
         "image,logo.png",
         "script,script.js",
         "ajax,cache"

src/loaders/curl/Dockerfile

@@ -1,5 +1,10 @@
 FROM alpine:3.20.3
-RUN apk add --no-cache curl=8.11.0-r2 util-linux=2.40.1-r1
+
+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
+
+RUN apk add --no-cache curl util-linux
 WORKDIR /usr/bin/
 COPY loader.sh /usr/bin
 RUN chmod +x /usr/bin/loader.sh

src/loaders/curl/loader.sh

@@ -8,7 +8,6 @@ while true; do
 	ID=$(uuidgen)
 	for URL in ${URLS}; do
 		/usr/bin/curl -s "${URL}?unique_session_id=${ID}"
-		#/usr/bin/curl -s -X POST -d "unique_session_id=${ID}" "${URL}"
 	done
 	sleep "${SLEEP}"
-done
+done

src/services/java/Dockerfile

@@ -5,6 +5,11 @@ COPY pom.xml /home/app
 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.description="java service for app-simulator"
+LABEL org.opencontainers.image.licenses=BSD-3-Clause
+
 RUN mkdir -p /app/dependency-jars
 WORKDIR /app
 COPY --from=build /home/app/target /app/