adding category in the template property file (#1094)

Update OpenShift workflow to use GHCR by default (#6)

ci/makefile.yml

@@ -1,27 +0,0 @@
-name: Makefile CI
-
-on:
-  push:
-    branches: [ $default-branch ]
-  pull_request:
-    branches: [ $default-branch ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    
-    - name: configure
-      run: ./configure
-      
-    - name: Install dependencies
-      run: make
-      
-    - name: Run check
-      run: make check
-      
-    - name: Run distcheck
-      run: make distcheck

ci/properties/dotnet.properties.json

@@ -2,5 +2,5 @@
     "name": ".NET",
     "description": "Build and test a .NET or ASP.NET Core project.",
     "iconName": "dotnet",
-    "categories": ["Continuous integration", "C#", "F#", "Visual Basic", "ASP", "ASP.NET", ".NET", "AspNetCore", "DotNetConsole"]
+    "categories": ["Continuous integration", "C#", "F#", "Visual Basic", "ASP", "ASP.NET", ".NET"]
 }

ci/properties/makefile.properties.json

@@ -1,6 +0,0 @@
-{
-    "name": "Build projects with Make",
-    "description": "Build and test a project using Make.",
-    "iconName": "makefile",
-    "categories": ["Continuous integration", "Makefile"]
-}

ci/properties/pylint.properties.json

@@ -2,5 +2,5 @@
     "name": "Pylint",
     "description": "Lint a Python application with pylint.",
     "iconName": "python",
-    "categories": ["Continuous integration", "Python", "Bottle", "Flask"]
+    "categories": ["Continuous integration", "Python"]
 }

ci/properties/python-app.properties.json

@@ -2,5 +2,5 @@
     "name": "Python application",
     "description": "Create and test a Python application.",
     "iconName": "python",
-    "categories": ["Continuous integration", "Python", "Bottle", "Flask"]
+    "categories": ["Continuous integration", "Python"]
 }

ci/properties/python-package.properties.json

@@ -2,5 +2,5 @@
     "name": "Python package",
     "description": "Create and test a Python package on multiple Python versions.",
     "iconName": "python",
-    "categories": ["Continuous integration", "Python", "Bottle", "Flask"]
+    "categories": ["Continuous integration", "Python"]
 }

ci/properties/rails-lint.properties.json

@@ -2,5 +2,5 @@
     "name": "Rails - Build and Run Linters",
     "description": "Build Rails application and run linters",
     "iconName": "ruby",
-    "categories": ["Ruby", "Rails"]
+    "categories": ["Continuous integration", "Ruby", "Rails"]
 }

ci/properties/rubyonrails-lint.properties.json

@@ -1,6 +0,0 @@
-{
-    "name": "Rails - Install Dependencies and Run Linters",
-    "description": "Install dependencies and run linters on Rails application",
-    "iconName": "ruby",
-    "categories": ["Continuous integration", "Ruby", "Rails"]
-}

ci/rubyonrails-lint.yml

@@ -1,32 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies, and  run linters
-name: Rails - Install dependencies and run linters
-
-on:
-  push:
-    branches: [ $default-branch ]
-  pull_request:
-    branches: [ $default-branch ]
-jobs:
-  run-lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Setup Ruby and install gems
-        uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
-        with:
-          bundler-cache: true
-      # Add or Replace any other security checks here
-      - name: Run security checks
-        run: |
-          bin/bundler-audit --update
-          bin/brakeman -q -w2
-      # Add or Replace any other Linters here
-      - name: Run linters
-        run: |
-          bin/rubocop --parallel

deployments/ibm2.yml

@@ -1,75 +0,0 @@
-# This workflow will build a docker container, publish it to IBM Container Registry, and deploy it to IKS when a release is created
-#
-# To configure this workflow:
-#
-# 1. Ensure that your repository contains a Dockerfile
-# 2. Setup secrets in your repository by going to settings: Create ICR_NAMESPACE and IBM_CLOUD_API_KEY
-# 3. Change the values for the IBM_CLOUD_REGION, REGISTRY_HOSTNAME, IMAGE_NAME, IKS_CLUSTER, DEPLOYMENT_NAME, and PORT
-
-name: Build and Deploy to IKS
-
-on:
-  release:
-    types: [created]
-
-# Environment variables available to all jobs and steps in this workflow
-env:
-  GITHUB_SHA: ${{ github.sha }}
-  IBM_CLOUD_API_KEY: ${{ secrets.IBM_CLOUD_API_KEY }}
-  IBM_CLOUD_REGION: us-south
-  ICR_NAMESPACE: ${{ secrets.ICR_NAMESPACE }}
-  REGISTRY_HOSTNAME: us.icr.io
-  IMAGE_NAME: iks-test
-  IKS_CLUSTER: example-iks-cluster-name-or-id
-  DEPLOYMENT_NAME: iks-test
-  PORT: 5001
-
-jobs:
-  setup-build-publish-deploy:
-    name: Setup, Build, Publish, and Deploy
-    runs-on: ubuntu-latest
-    environment: production
-    steps:
-
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    # Download and Install IBM Cloud CLI
-    - name: Install IBM Cloud CLI
-      run: |
-        curl -fsSL https://clis.cloud.ibm.com/install/linux | sh
-        ibmcloud --version
-        ibmcloud config --check-version=false
-        ibmcloud plugin install -f kubernetes-service
-        ibmcloud plugin install -f container-registry
-
-    # Authenticate with IBM Cloud CLI
-    - name: Authenticate with IBM Cloud CLI
-      run: |
-        ibmcloud login --apikey "${IBM_CLOUD_API_KEY}" -r "${IBM_CLOUD_REGION}" -g default
-        ibmcloud cr region-set "${IBM_CLOUD_REGION}"
-        ibmcloud cr login
-
-    # Build the Docker image
-    - name: Build with Docker
-      run: |
-        docker build -t "$REGISTRY_HOSTNAME"/"$ICR_NAMESPACE"/"$IMAGE_NAME":"$GITHUB_SHA" \
-          --build-arg GITHUB_SHA="$GITHUB_SHA" \
-          --build-arg GITHUB_REF="$GITHUB_REF" .
-
-    # Push the image to IBM Container Registry
-    - name: Push the image to ICR
-      run: |
-        docker push $REGISTRY_HOSTNAME/$ICR_NAMESPACE/$IMAGE_NAME:$GITHUB_SHA
-
-    # Deploy the Docker image to the IKS cluster
-    - name: Deploy to IKS
-      run: |
-        ibmcloud ks cluster config --cluster $IKS_CLUSTER
-        kubectl config current-context
-        kubectl create deployment $DEPLOYMENT_NAME --image=$REGISTRY_HOSTNAME/$ICR_NAMESPACE/$IMAGE_NAME:$GITHUB_SHA --dry-run -o yaml > deployment.yaml
-        kubectl apply -f deployment.yaml
-        kubectl rollout status deployment/$DEPLOYMENT_NAME
-        kubectl create service loadbalancer $DEPLOYMENT_NAME --tcp=80:$PORT --dry-run -o yaml > service.yaml
-        kubectl apply -f service.yaml
-        kubectl get services -o wide

deployments/maven_CD.yml

@@ -1,26 +0,0 @@
-# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Java CI with Maven
-
-on:
-  push:
-    branches: [ $default-branch ]
-  pull_request:
-    branches: [ $default-branch ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        java-version: '11'
-        distribution: 'adopt'
-        cache: maven
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml

deployments/openshift.yml

@@ -3,61 +3,57 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-### The OpenShift Starter workflow will:
+# 💁 The OpenShift Starter workflow will:
 # - Checkout your repository
-# - Perform a Docker build
-# - Push the built image to an image registry
+# - Perform a container image build
+# - Push the built image to the GitHub Container Registry (GHCR)
 # - Log in to your OpenShift cluster
-# - Create an OpenShift app from the image and expose it to the internet.
+# - Create an OpenShift app from the image and expose it to the internet
 
-### Before you begin:
-# - Have write access to a container image registry such as quay.io or Dockerhub.
-# - Have access to an OpenShift cluster.
-#   - For instructions to get started with OpenShift see https://www.openshift.com/try
-# - The project you wish to add this workflow to should have a Dockerfile.
-#   - If you don't have a Dockerfile at the repository root, see the buildah-build step.
-#   - Builds from scratch are also available, but require more configuration.
+# ℹ️ Configure your repository and the workflow with the following steps:
+# 1. Have access to an OpenShift cluster. Refer to https://www.openshift.com/try
+# 2. Create the OPENSHIFT_SERVER and OPENSHIFT_TOKEN repository secrets. Refer to:
+#   - https://github.com/redhat-actions/oc-login#readme
+#   - https://docs.github.com/en/actions/reference/encrypted-secrets
+#   - https://cli.github.com/manual/gh_secret_set
+# 3. (Optional) Edit the top-level 'env' section as marked with '🖊️' if the defaults are not suitable for your project.
+# 4. (Optional) Edit the build-image step to build your project.
+#    The default build type is by using a Dockerfile at the root of the repository,
+#    but can be replaced with a different file, a source-to-image build, or a step-by-step buildah build.
+# 5. Commit and push the workflow file to your default branch to trigger a workflow run.
 
-### To get the workflow running:
-# 1. Add this workflow to your repository.
-# 2. Edit the top-level 'env' section, which contains a list of environment variables that must be configured.
-# 3. Create the secrets referenced in the 'env' section under your repository Settings.
-# 4. Edit the 'branches' in the 'on' section to trigger the workflow on a push to your branch.
-# 5. Commit and push your changes.
-
-# For a more sophisticated example, see https://github.com/redhat-actions/spring-petclinic/blob/main/.github/workflows/petclinic-sample.yaml
-# Also see our GitHub organization, https://github.com/redhat-actions/
-# ▶️ See a video of how to set up this workflow at https://www.youtube.com/watch?v=6hgBO-1pKho
+# 👋 Visit our GitHub organization at https://github.com/redhat-actions/ to see our actions and provide feedback.
 
 name: OpenShift
 
-# ⬇️  Modify the fields marked with ⬇️ to fit your project, and create any secrets that are referenced.
-# https://docs.github.com/en/free-pro-team@latest/actions/reference/encrypted-secrets
 env:
-  # ⬇️ EDIT with your registry and registry path.
-  REGISTRY: quay.io/<username>
-  # ⬇️ EDIT with your registry username.
-  REGISTRY_USER: <username>
-  REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
-
-  # ⬇️ EDIT to log into your OpenShift cluster and set up the context.
+  # 🖊️ EDIT your repository secrets to log into your OpenShift cluster and set up the context.
   # See https://github.com/redhat-actions/oc-login#readme for how to retrieve these values.
+  # To get a permanent token, refer to https://github.com/redhat-actions/oc-login/wiki/Using-a-Service-Account-for-GitHub-Actions
   OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }}
   OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
-
-  # ⬇️ EDIT with any additional port your application should expose.
-  # By default, oc new-app action creates a service to the image's lowest numeric exposed port.
-  APP_PORT: ""
-
-  # ⬇️ EDIT if you wish to set the kube context's namespace after login. Leave blank to use the default namespace.
+  # 🖊️ EDIT to set the kube context's namespace after login. Leave blank to use your user's default namespace.
   OPENSHIFT_NAMESPACE: ""
 
-  # If you wish to manually provide the APP_NAME and TAG, set them here, otherwise they will be auto-detected.
+  # 🖊️ EDIT to set a name for your OpenShift app, or a default one will be generated below.
   APP_NAME: ""
-  TAG: ""
+
+  # 🖊️ EDIT with the port your application should be accessible on.
+  # If the container image exposes *exactly one* port, this can be left blank.
+  # Refer to the 'port' input of https://github.com/redhat-actions/oc-new-app
+  APP_PORT: ""
+
+  # 🖊️ EDIT to change the image registry settings.
+  # Registries such as GHCR, Quay.io, and Docker Hub are supported.
+  IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
+  IMAGE_REGISTRY_USER: ${{ github.actor }}
+  IMAGE_REGISTRY_PASSWORD: ${{ github.token }}
+
+  # 🖊️ EDIT to specify custom tags for the container image, or default tags will be generated below.
+  IMAGE_TAGS: ""
 
 on:
-  # https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows
+  # https://docs.github.com/en/actions/reference/events-that-trigger-workflows
   push:
     # Edit to the branch(es) you want to build and deploy on each push.
     branches: [ $default-branch ]
@@ -65,32 +61,40 @@ on:
 jobs:
   openshift-ci-cd:
     name: Build and deploy to OpenShift
+    # ubuntu-20.04 can also be used.
     runs-on: ubuntu-18.04
     environment: production
 
     outputs:
-        ROUTE: ${{ steps.deploy-and-expose.outputs.route }}
-        SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }}
+      ROUTE: ${{ steps.deploy-and-expose.outputs.route }}
+      SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }}
 
     steps:
-    - name: Check if secrets exists
-      uses: actions/github-script@v3
+    - name: Check for required secrets
+      uses: actions/github-script@v4
       with:
         script: |
           const secrets = {
-            REGISTRY_PASSWORD: `${{ secrets.REGISTRY_PASSWORD }}`,
             OPENSHIFT_SERVER: `${{ secrets.OPENSHIFT_SERVER }}`,
             OPENSHIFT_TOKEN: `${{ secrets.OPENSHIFT_TOKEN }}`,
           };
 
+          const GHCR = "ghcr.io";
+          if (`${{ env.IMAGE_REGISTRY }}`.startsWith(GHCR)) {
+            core.info(`Image registry is ${GHCR} - no registry password required`);
+          }
+          else {
+            core.info("A registry password is required");
+            secrets["IMAGE_REGISTRY_PASSWORD"] = `${{ secrets.IMAGE_REGISTRY_PASSWORD }}`;
+          }
+
           const missingSecrets = Object.entries(secrets).filter(([ name, value ]) => {
             if (value.length === 0) {
-              core.warning(`Secret "${name}" is not set`);
+              core.error(`Secret "${name}" is not set`);
               return true;
             }
             core.info(`✔️ Secret "${name}" is set`);
             return false;
-
           });
 
           if (missingSecrets.length > 0) {
@@ -104,48 +108,50 @@ jobs:
             core.info(`✅ All the required secrets are set`);
           }
 
-    - uses: actions/checkout@v2
+    - name: Check out repository
+      uses: actions/checkout@v2
 
     - name: Determine app name
       if: env.APP_NAME == ''
       run: |
         echo "APP_NAME=$(basename $PWD)" | tee -a $GITHUB_ENV
 
-    - name: Determine tag
-      if: env.TAG == ''
+    - name: Determine image tags
+      if: env.IMAGE_TAGS == ''
       run: |
-        echo "TAG=${GITHUB_SHA::7}" | tee -a $GITHUB_ENV
+        echo "IMAGE_TAGS=latest ${GITHUB_SHA::12}" | tee -a $GITHUB_ENV
 
     # https://github.com/redhat-actions/buildah-build#readme
     - name: Build from Dockerfile
-      id: image-build
+      id: build-image
       uses: redhat-actions/buildah-build@v2
       with:
         image: ${{ env.APP_NAME }}
-        tags: ${{ env.TAG }}
-        # If you don't have a dockerfile, see:
-        # https://github.com/redhat-actions/buildah-build#scratch-build-inputs
-        # Otherwise, point this to your Dockerfile relative to the repository root.
+        tags: ${{ env.IMAGE_TAGS }}
+
+        # If you don't have a Dockerfile/Containerfile, refer to https://github.com/redhat-actions/buildah-build#scratch-build-inputs
+        # Or, perform a source-to-image build using https://github.com/redhat-actions/s2i-build
+        # Otherwise, point this to your Dockerfile/Containerfile relative to the repository root.
         dockerfiles: |
           ./Dockerfile
 
     # https://github.com/redhat-actions/push-to-registry#readme
     - name: Push to registry
-      id: push-to-registry
+      id: push-image
       uses: redhat-actions/push-to-registry@v2
       with:
-        image: ${{ steps.image-build.outputs.image }}
-        tags: ${{ steps.image-build.outputs.tags }}
-        registry: ${{ env.REGISTRY }}
-        username: ${{ env.REGISTRY_USER }}
-        password: ${{ env.REGISTRY_PASSWORD }}
+        image: ${{ steps.build-image.outputs.image }}
+        tags: ${{ steps.build-image.outputs.tags }}
+        registry: ${{ env.IMAGE_REGISTRY }}
+        username: ${{ env.IMAGE_REGISTRY_USER }}
+        password: ${{ env.IMAGE_REGISTRY_PASSWORD }}
 
-    # The path the image was pushed to is now stored in ${{ steps.push-to-registry.outputs.registry-path }}
+    # The path the image was pushed to is now stored in ${{ steps.push-image.outputs.registry-path }}
 
-    # oc-login works on all platforms, but oc must be installed first.
-    # The GitHub Ubuntu runner already includes oc.
-    # Otherwise, https://github.com/redhat-actions/openshift-tools-installer can be used to install oc,
-    # as well as many other tools.
+    - name: Install oc
+      uses: redhat-actions/openshift-tools-installer@v1
+      with:
+        oc: 4
 
     # https://github.com/redhat-actions/oc-login#readme
     - name: Log in to OpenShift
@@ -163,18 +169,19 @@ jobs:
       uses: redhat-actions/oc-new-app@v1
       with:
         app_name: ${{ env.APP_NAME }}
-        image: ${{ steps.push-to-registry.outputs.registry-path }}
+        image: ${{ steps.push-image.outputs.registry-path }}
         namespace: ${{ env.OPENSHIFT_NAMESPACE }}
         port: ${{ env.APP_PORT }}
 
-    - name: View application route
+    - name: Print application URL
+      env:
+        ROUTE: ${{ steps.deploy-and-expose.outputs.route }}
+        SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }}
       run: |
         [[ -n ${{ env.ROUTE }} ]] || (echo "Determining application route failed in previous step"; exit 1)
+        echo
         echo "======================== Your application is available at: ========================"
         echo ${{ env.ROUTE }}
         echo "==================================================================================="
         echo
         echo "Your app can be taken down with: \"oc delete all --selector='${{ env.SELECTOR }}'\""
-      env:
-        ROUTE: ${{ steps.deploy-and-expose.outputs.route }}
-        SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }}

deployments/properties/aws.properties.json

@@ -3,5 +3,5 @@
     "description": "Deploy a container to an Amazon ECS service powered by AWS Fargate or Amazon EC2.",
     "creator": "Amazon Web Services",
     "iconName": "aws",
-    "categories": ["Deployment", "JavaScript", "npm"]
+    "categories": ["Deployment"]
 }

deployments/properties/azure.properties.json

@@ -1,7 +1,7 @@
 {
     "name": "Deploy Node.js to Azure Web App",
-    "description": "[Test Partner]Build a Node.js project and deploy it to an Azure Web App.",
+    "description": "Build a Node.js project and deploy it to an Azure Web App.",
     "creator": "Microsoft Azure",
     "iconName": "azure",
-    "categories": ["Deployment", "JavaScript", "npm"]
+    "categories": ["Deployment"]
 }

deployments/properties/ibm.properties.json

@@ -1,7 +1,7 @@
 {
-    "name": "(Python)Deploy to IBM Cloud Kubernetes Service",
+    "name": "Deploy to IBM Cloud Kubernetes Service",
     "description": "Build a docker container, publish it to IBM Cloud Container Registry, and deploy to IBM Cloud Kubernetes Service.",
     "creator": "IBM",
     "iconName": "ibm",
-    "categories": ["Deployment", "Python"]
+    "categories": ["Deployment"]
 }

deployments/properties/ibm2.properties.json

@@ -1,7 +0,0 @@
-{
-    "name": "(Java)Deploy to IBM Cloud Kubernetes Service",
-    "description": "(Java)Build a docker container, publish it to IBM Cloud Container Registry, and deploy to IBM Cloud Kubernetes Service.",
-    "creator": "IBM",
-    "iconName": "ibm",
-    "categories": ["Deployment", "Java"]
-}

deployments/properties/maven_CD.properties.json

@@ -1,7 +0,0 @@
-{
-    "name": "CD Java with Maven",
-    "description": "CD Build and test a Java project with Apache Maven.",
-    "creator": "Amazon Web Services",
-    "iconName": "aws",
-    "categories": ["Deployment", "Java", "Maven", "Spring", "JSF"]
-}

deployments/properties/python-app_CD.properties.json

@@ -1,7 +0,0 @@
-{
-    "name": "CD Python application",
-    "description": "CD Create and test a Python application.",
-    "creator": "IBM",
-    "iconName": "ibm",
-    "categories": ["Deployment", "Python", "Bottle", "Flask"]
-}

deployments/python-app_CD.yml

@@ -1,36 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Python application
-
-on:
-  push:
-    branches: [ $default-branch ]
-  pull_request:
-    branches: [ $default-branch ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.9
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install flake8 pytest
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-    - name: Lint with flake8
-      run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - name: Test with pytest
-      run: |
-        pytest

icons/makefile.svg

@@ -1 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M3.403 2.47a2.06 2.06 0 0 0-2.06 2.06v12.364a2.06 2.06 0 0 0 2.06 2.06h7.983l1.758 1.654a.31.31 0 0 0 .399.02l1.27-1.024c.388.148.768.227 1.166.266l.687 1.489a.305.305 0 0 0 .362.157l2.334-.704a.308.308 0 0 0 .215-.335l-.245-1.62c.151-.125.296-.255.434-.402.138-.147.262-.307.387-.475l1.62.157a.31.31 0 0 0 .321-.235l.554-2.374a.3.3 0 0 0-.18-.353l-1.525-.595a4.416 4.416 0 0 0-.342-1.141l.942-1.334a.31.31 0 0 0-.046-.397l-1.61-1.509V4.531a2.06 2.06 0 0 0-2.06-2.06zm0 4.121h14.423v4.383c-.31-.1-.62-.168-.94-.204l-.69-1.483a.301.301 0 0 0-.364-.156l-2.334.704a.301.301 0 0 0-.215.334l.26 1.606c-.16.134-.312.27-.45.416a4.743 4.743 0 0 0-.374.46l-1.631-.142a.3.3 0 0 0-.32.235l-.556 2.375a.306.306 0 0 0 .18.352l1.529.59c.046.285.123.56.221.833H3.403zm12.991 6.596a2.136 2.136 0 0 1 1.497.578 2.136 2.136 0 0 1 .097 3.02 2.136 2.136 0 0 1-3.018.094 2.136 2.136 0 0 1-.097-3.018 2.136 2.136 0 0 1 1.521-.674z" style="fill:#ef5350;stroke-width:1.0302"/></svg>