Upsync (for later) #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

commjoen wants to merge 809 commits into OWASP:main from juice-shop:main

.github/dependabot.yaml

-Original file line number
+Diff line change
@@ -0,0 +1,81 @@
+    version: 2
+    updates:
+      - package-ecosystem: "gomod"
+        directory: "/balancer"
+        schedule:
+          interval: "weekly"
+        commit-message:
+          prefix: "chore"
+          include: "scope"
+        groups:
+          golang-dependencies:
+            patterns:
+              - "*"
+      - package-ecosystem: "gomod"
+        directory: "/cleaner"
+        schedule:
+          interval: "weekly"
+        commit-message:
+          prefix: "chore"
+          include: "scope"
+        groups:
+          golang-dependencies:
+            patterns:
+              - "*"
+      - package-ecosystem: "gomod"
+        directory: "/progress-watchdog"
+        schedule:
+          interval: "weekly"
+        commit-message:
+          prefix: "chore"
+          include: "scope"
+        groups:
+          golang-dependencies:
+            patterns:
+              - "*"
+      - package-ecosystem: "npm"
+        directory: "/balancer/ui"
+        schedule:
+          interval: "weekly"
+        commit-message:
+          prefix: "chore"
+          include: "scope"
+        groups:
+          npm-dependencies:
+            patterns:
+              - "*"
+            update-types:
+              - "minor"
+              - "patch"
+          npm-breaking-updates-dependencies:
+            patterns:
+              - "*"
+            update-types:
+              - "major"
+      - package-ecosystem: "docker"
+        directory: "/"
+        schedule:
+          interval: "weekly"
+        commit-message:
+          prefix: "chore"
+          include: "scope"
+        groups:
+          docker-dependencies:
+            patterns:
+              - "*"
+      - package-ecosystem: "github-actions"
+        directory: "/"
+        schedule:
+          interval: "weekly"
+        commit-message:
+          prefix: "chore"
+          include: "scope"
+        groups:
+          github-actions-dependencies:
+            patterns:
+              - "*"

.github/release-drafter.yml

This file was deleted.

.github/release.yml

-Original file line number
+Diff line change
@@ -0,0 +1,17 @@
+    changelog:
+      categories:
+        - title: "🚀 Features"
+          labels:
+            - "feature"
+            - "enhancement"
+        - title: "🐛 Bug Fixes"
+          labels:
+            - "fix"
+            - "bugfix"
+            - "bug"
+        - title: "📚 Docs"
+          label: "documentation"
+        - title: "🌐 I18N"
+          label: "i18n"
+        - title: "🧰 Maintenance"
+          label: "maintenance"

.github/workflows/publish.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,67 +1,100 @@
  
    name: "Release Build"

    on:

      release:

        types: [published]

    name: "Publish Docker Images"

    env:

      CONTAINER_REGISTRY: ghcr.io/juice-shop

    jobs:

      helmRelease:

        name: "Package Helm Chart"

        name: "Publish Helm Chart"

        runs-on: ubuntu-latest

        permissions:

          contents: read

          packages: write

        steps:

          - uses: actions/checkout@v1

          - name: "Install yq"

            run: |

              sudo snap install yq

          - name: "Patch Chart.yaml to the current released version"

            working-directory: helm/multi-juicer/

          - uses: actions/checkout@v6

          - id: release-version

            name: Parse Release Version

            run: |

              RELEASE_VERSION="${GITHUB_REF#refs/*/}"

              # Remove leading 'v' from git tag to create valid semver

              RELEASE_VERSION="${RELEASE_VERSION//v}"

              # patch the version & appVersion in the Chart.yaml to the release version

              yq eval -i ".version = \"$RELEASE_VERSION\", .appVersion = \"$RELEASE_VERSION\"" Chart.yaml

          - uses: J12934/[email protected]

            with:

              access-token: ${{ secrets.ACCESS_TOKEN }}

              charts-folder: helm

              deploy-branch: gh-pages

              echo "version=$RELEASE_VERSION" >> "$GITHUB_OUTPUT"

          - name: "Login to Package Registry"

            run: 'echo "${{ secrets.GITHUB_TOKEN }}" | helm registry login --username ${{ github.actor }} --password-stdin ${{ env.CONTAINER_REGISTRY }}'

          - name: "Package Helm Chart"

            working-directory: helm/multi-juicer/

            run: |

              helm package --version "${{ steps.release-version.outputs.version }}" --app-version "${{ steps.release-version.outputs.version }}" .

          - name: "Push Helm Chart"

            working-directory: helm/multi-juicer/

            run: |

              helm push "multi-juicer-${{ steps.release-version.outputs.version }}.tgz" oci://${{ env.CONTAINER_REGISTRY }}/multi-juicer/helm

      dockerBuilds:

        name: "Build"

        runs-on: ubuntu-latest

        permissions:

          contents: read

          packages: write

          id-token: write # needed for signing the images with GitHub OIDC Token

        strategy:

          matrix:

            component:

              - progress-watchdog

              - cleaner

              - juice-balancer

              - balancer

        steps:

          - name: Checkout

            uses: actions/checkout@v2

            uses: actions/checkout@v6

          - name: Install Cosign

            uses: sigstore/cosign-installer@v3

          - name: Docker Meta

            id: docker_meta

            uses: docker/metadata-action@v3

          - id: image-metadata

            name: Container Image Metadata

            uses: docker/metadata-action@v5

            with:

              images: iteratec/${{ matrix.component }}

              images: ${{ env.CONTAINER_REGISTRY }}/multi-juicer/${{ matrix.component }}

              tags: |

                type=semver,pattern={{raw}}

          - name: Set up QEMU

            uses: docker/setup-qemu-action@v2

            uses: docker/setup-qemu-action@v3

          - name: Set up Docker Buildx

            uses: docker/setup-buildx-action@v2

          - name: Login to DockerHub

            uses: docker/login-action@v1

            uses: docker/setup-buildx-action@v3

          - name: Login to Container Registry

            uses: docker/login-action@v3

            with:

              username: ${{ secrets.DOCKER_USERNAME }}

              password: ${{ secrets.DOCKER_PASSWORD }}

              registry: ${{ env.CONTAINER_REGISTRY }}

              username: ${{ github.actor }}

              password: ${{ secrets.GITHUB_TOKEN }}

          - name: Extract JuiceShop Version from Helm Values

            id: extract-juice-shop-version

            run: |

              JUICE_SHOP_VERSION=$(yq eval '.config.juiceShop.tag' helm/multi-juicer/values.yaml)

              echo "version=$JUICE_SHOP_VERSION" >> "$GITHUB_OUTPUT"

          - name: Build and Push

            uses: docker/build-push-action@v3

          - id: build-and-push

            name: Build and Push

            uses: docker/build-push-action@v6

            with:

              context: ./${{ matrix.component }}

              file: ./${{ matrix.component }}/Dockerfile

              platforms: linux/amd64,linux/arm/v7,linux/arm64

              platforms: linux/amd64,linux/arm64

              push: true

              tags: ${{ steps.docker_meta.outputs.tags }}

              labels: ${{ steps.docker_meta.outputs.labels }}

              tags: ${{ steps.image-metadata.outputs.tags }}

              labels: ${{ steps.image-metadata.outputs.labels }}

              build-args: |

                JUICE_SHOP_VERSION=${{ steps.extract-juice-shop-version.outputs.version }}

          - name: Sign the images with GitHub OIDC Token

            env:

              DIGEST: ${{ steps.build-and-push.outputs.digest }}

              TAGS: ${{ steps.image-metadata.outputs.tags }}

            run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}

.github/workflows/release-notes.yaml

This file was deleted.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Upsync (for later) #56

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Upsync (for later) #56

Are you sure you want to change the base?

Uh oh!

Upsync (for later) #56

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!