diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 5f932b7..358e7a2 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -52,14 +52,14 @@ jobs: needs: sonarqube runs-on: docker steps: - - name: Prepare environment variables - run: | - echo REGISTRY=${{ env.FORGEJO_HOST }} >> $GITHUB_ENV - name: Setup Node environment run: | apk add --update nodejs npm - node --version - npm --version + - name: Prepare environment variables + run: | + echo REGISTRY=${{ env.FORGEJO_HOST }} >> $GITHUB_ENV + echo CONTAINER_NAME=${{ env.CONTAINER_NAME }} >> $GITHUB_ENV + echo VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV - name: Code checkout uses: actions/checkout@v4 with: @@ -83,13 +83,14 @@ jobs: # provenance: false # tags: ${{ env.REGISTRY }}/${{ github.actor }}/${{ env.CONTAINER_NAME }}:latest - - name: check docker - run: | - docker --version - docker info + # - name: check docker + # run: | + # docker --version + # docker info - name: Build Docker image (pray) run: | - docker build -f ./devops/Dockerfile -t ${{ env.CONTAINER_NAME }}:latest . + echo [${{ env.CONTAINER_NAME }}:${{ github.VERSION }}, ${{ env.CONTAINER_NAME }}:latest] + docker build -f ./devops/Dockerfile -t ${{ env.CONTAINER_NAME }}:${{ github.VERSION }} -t ${{ env.CONTAINER_NAME }}:latest . docker images #### diff --git a/package.json b/package.json index 79455e0..0248fca 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "name": "glowing-fiesta", + "version": "1.0.0", "type": "module", "private": true, "scripts": {