Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
coutoPL committed Jul 31, 2024
2 parents 3347ad6 + b012306 commit dffe838
Show file tree
Hide file tree
Showing 6 changed files with 97 additions and 6 deletions.
14 changes: 13 additions & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ on:
- main
- staging
- release/*
workflow_dispatch:
inputs:
nussknacker_version:
description: "Nussknacker version"
required: false
type: string

env:
INPUT_NUSSKNACKER_VERSION: ${{ inputs.nussknacker_version }}

jobs:

Expand All @@ -29,7 +38,10 @@ jobs:
- name: Test Quickstart start
timeout-minutes: 10
run: |
./start.sh || (docker-compose logs && exit 1)
if [[ -n "$INPUT_NUSSKNACKER_VERSION" ]]; then
echo "NUSSKNACKER_VERSION=$INPUT_NUSSKNACKER_VERSION" > .env
fi
./start.sh || (docker compose logs && exit 1)
- name: Clean up Quickstart
run: |
./stop-and-clean.sh
Expand Down
5 changes: 1 addition & 4 deletions designer/application-customizations.conf
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
## To customize Nu Designer configuration see https://nussknacker.io/documentation/docs/installation_configuration_guide/Common/
## To customize Nu Designer configuration see https://nussknacker.io/documentation/docs/configuration/Common/#configuration-file

scenarioTypes {
"streaming" {
# customize Flink streaming scenario type
# see: https://nussknacker.io/documentation/docs/next/installation_configuration_guide/Common/#configuration-file
}
"streaming-lite-embedded" {
# customize Lite streaming scenario type
# see: https://nussknacker.io/documentation/docs/next/installation_configuration_guide/Common/#configuration-file
}
"request-response-embedded": {
# customize Lite request-response scenario type
# see: https://nussknacker.io/documentation/docs/next/installation_configuration_guide/Common/#configuration-file
}
}
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ services:
deploy:
resources:
limits:
memory: 128M
memory: 256M

volumes:
nussknacker_designer_data:
Expand Down
22 changes: 22 additions & 0 deletions download-and-start.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
@echo off
chcp 65001 >nul
setlocal enabledelayedexpansion

set "BRANCH_NAME=%~1"
if "%BRANCH_NAME%"=="" set "BRANCH_NAME=main"

set "NU_QUICKSTART_DIR=nussknacker-quickstart-%BRANCH_NAME%"

powershell -Command "Invoke-WebRequest -Uri 'https://github.com/TouK/nussknacker-quickstart/archive/refs/heads/%BRANCH_NAME%.zip' -OutFile '%NU_QUICKSTART_DIR%.zip'"

if exist "%NU_QUICKSTART_DIR%" (
rd /s /q "%NU_QUICKSTART_DIR%"
)

powershell -Command "Expand-Archive -Path '%NU_QUICKSTART_DIR%.zip' -DestinationPath ."

cd "%NU_QUICKSTART_DIR%"

call start.bat

endlocal
30 changes: 30 additions & 0 deletions start.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
@echo off
chcp 65001 >nul
setlocal enabledelayedexpansion

echo Running Nussknacker Quickstart ...
echo.

docker --version >nul 2>&1
if errorlevel 1 (
echo No Docker found. Docker is required to run this Quickstart. See https://docs.docker.com/engine/install/
exit /b 1
)

docker compose version >nul 2>&1
if errorlevel 1 (
echo No docker compose found. It seems you have to upgrade your Docker installation. See https://docs.docker.com/engine/install/
exit /b 2
)

docker compose config >nul 2>&1
if errorlevel 1 (
echo Cannot validate docker compose configuration. It seems you have to upgrade your Docker installation. See https://docs.docker.com/engine/install/
exit /b 3
)

docker compose up -d --build --wait

echo.
echo Nussknacker and its dependencies are up and running.
echo Open http://localhost:8080 and log in as admin:admin ...
30 changes: 30 additions & 0 deletions stop-and-clean.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
@echo off
setlocal enabledelayedexpansion

cd /d "%~dp0"

echo Running Nussknacker Quickstart clean up ...
echo.

docker --version >nul 2>&1
if errorlevel 1 (
echo No Docker found. Docker is required to run this Quickstart. See https://docs.docker.com/engine/install/
exit /b 1
)

docker compose version >nul 2>&1
if errorlevel 1 (
echo No docker compose found. It seems you have to upgrade your Docker installation. See https://docs.docker.com/engine/install/
exit /b 2
)

docker compose config >nul 2>&1
if errorlevel 1 (
echo Cannot validate docker compose configuration. It seems you have to upgrade your Docker installation. See https://docs.docker.com/engine/install/
exit /b 3
)

docker compose down -v

echo All is cleaned. Goodbye

0 comments on commit dffe838

Please sign in to comment.