diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index ecca100..f5541a7 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -2,9 +2,9 @@ name: CI/CD Pipeline on: push: - branches: [ main, develop, 4nk-node-integration ] + branches: [ docker-support ] pull_request: - branches: [ main, develop ] + branches: [ docker-support ] jobs: test: @@ -46,10 +46,10 @@ jobs: - name: Build application run: npm run build - - name: Test Docker build + - name: Test Docker build (artefacts) run: | - docker build -f Dockerfile.4nk-node -t ihm-client:test . - docker rmi ihm-client:test + docker build -t ihm-client:dist . + docker image rm ihm-client:dist security: runs-on: ubuntu-latest @@ -104,11 +104,7 @@ jobs: - name: Setup Docker Buildx uses: docker/setup-buildx-action@v2 - - name: Build and test Docker integration + - name: Build Docker artefacts run: | - docker build -f Dockerfile.4nk-node -t ihm-client:integration . - docker run --rm -d --name ihm-client-test -p 8080:80 ihm-client:integration - sleep 10 - curl -f http://localhost:8080 || exit 1 - docker stop ihm-client-test - docker rmi ihm-client:integration + docker build -t ihm-client:dist . + docker image rm ihm-client:dist diff --git a/package.json b/package.json index 2e4f17e..fdc169a 100755 --- a/package.json +++ b/package.json @@ -15,7 +15,9 @@ "build": "tsc && vite build", "deploy": "sudo cp -r dist/* /var/www/html/", "prettify": "prettier --config ./.prettierrc --write \"src/**/*{.ts,.html,.css,.js}\"", - "build:dist": "tsc -p tsconfig.build.json" + "build:dist": "tsc -p tsconfig.build.json", + "lint": "prettier -c \"src/**/*{.ts,.html,.css,.js}\"", + "type-check": "tsc -p tsconfig.json --noEmit" }, "keywords": [], "author": "",