diff --git a/.github/workflows/soos-dast-docker-image-beta.yml b/.github/workflows/soos-dast-docker-image-beta.yml index 37bfa84..23cb564 100644 --- a/.github/workflows/soos-dast-docker-image-beta.yml +++ b/.github/workflows/soos-dast-docker-image-beta.yml @@ -22,10 +22,9 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and Push - uses: docker/build-push-action@v5 - with: - context: . - push: ${{ github.event_name != 'pull_request' }} - tags: soosio/dast:beta - labels: ${{ steps.meta.outputs.labels }} + - name: Promote alpha to beta + id: promote-alpha-to-beta + run: | + docker pull soosio/dast:alpha + docker tag soosio/dast:alpha soosio/dast:beta + docker push soosio/dast:beta diff --git a/.github/workflows/soos-dast-docker-image-latest.yml b/.github/workflows/soos-dast-docker-image-latest.yml index 505d0d9..fcf9f9f 100644 --- a/.github/workflows/soos-dast-docker-image-latest.yml +++ b/.github/workflows/soos-dast-docker-image-latest.yml @@ -21,13 +21,12 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and Push - uses: docker/build-push-action@v5 - with: - context: . - push: ${{ github.event_name != 'pull_request' }} - tags: soosio/dast:latest - labels: ${{ steps.meta.outputs.labels }} + - name: Promote beta to latest + id: promote-beta-to-latest + run: | + docker pull soosio/dast:beta + docker tag soosio/dast:beta soosio/dast:latest + docker push soosio/dast:latest - name: Update Docker Hub Description uses: peter-evans/dockerhub-description@v3 with: diff --git a/.github/workflows/soos-dast-publish-aws-ecr.yml b/.github/workflows/soos-dast-publish-aws-ecr.yml index 0581959..0183249 100644 --- a/.github/workflows/soos-dast-publish-aws-ecr.yml +++ b/.github/workflows/soos-dast-publish-aws-ecr.yml @@ -25,12 +25,14 @@ jobs: with: registry-type: public - - name: Build, tag, and push image to Amazon ECR - id: build-image + - name: Promote alpha tag to latest, and push image to Amazon ECR + id: promote-image env: ECR_REGISTRY: public.ecr.aws/y6h0x1r3 ECR_REPOSITORY: soos-dast + IMAGE_TAG_ALPHA: alpha IMAGE_TAG: latest run: | - docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . + docker pull $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_ALPHA + docker tag $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_ALPHA $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG diff --git a/package-lock.json b/package-lock.json index e432f40..03da885 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "soos-dast", - "version": "2.0.33", + "version": "2.0.34", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "soos-dast", - "version": "2.0.33", + "version": "2.0.34", "license": "MIT", "dependencies": { "@soos-io/api-client": "0.2.47", @@ -16,7 +16,7 @@ }, "devDependencies": { "@types/argparse": "^2.0.15", - "@types/node": "^20.12.7", + "@types/node": "^20.12.8", "prettier": "^3.2.5", "typescript": "^5.4.5" } @@ -65,9 +65,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.12.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz", - "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==", + "version": "20.12.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.8.tgz", + "integrity": "sha512-NU0rJLJnshZWdE/097cdCBbyW1h4hEg0xpovcoAQYHl8dnEyp/NAOiE45pvc+Bd1Dt+2r94v2eGFpQJ4R7g+2w==", "dev": true, "dependencies": { "undici-types": "~5.26.4" diff --git a/package.json b/package.json index b8bd21a..de59409 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "soos-dast", - "version": "2.0.33", + "version": "2.0.34", "description": "SOOS DAST - The affordable no limit web vulnerability scanner", "main": "index.js", "scripts": { @@ -26,7 +26,7 @@ }, "devDependencies": { "@types/argparse": "^2.0.15", - "@types/node": "^20.12.7", + "@types/node": "^20.12.8", "prettier": "^3.2.5", "typescript": "^5.4.5" },