Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/dev' into main_to_dev
Browse files Browse the repository at this point in the history
  • Loading branch information
attiasas committed Aug 20, 2024
2 parents 39bc87f + 66a56f3 commit 837ecc5
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 3 deletions.
76 changes: 76 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
---
name: "🐛 Bug Report"
description: Create a report to help us improve
labels: [ bug ]
body:
- type: textarea
id: description
attributes:
label: Describe the bug
description: What is the problem? A clear and concise description of the bug.
validations:
required: true

- type: textarea
id: current
attributes:
label: Current behavior
description: |
Please include full errors, uncaught exceptions, screenshots, and relevant logs.
Logs can be found under '/Users/<user>/.jfrog-docker-desktop-extension/logs'
validations:
required: true

- type: textarea
id: reproduction
attributes:
label: Reproduction steps
description: |
Provide steps to reproduce the behavior.
validations:
required: false

- type: textarea
id: expected
attributes:
label: Expected behavior
description: |
What did you expect to happen?
validations:
required: false

- type: input
id: docker-version
attributes:
label: Docker Client and Desktop info
description: using 'docker version' command on your CLI
validations:
required: true

- type: input
id: jfrog-docker-version
attributes:
label: JFrog Docker Desktop Extension version
validations:
required: true

- type: input
id: os-version
attributes:
label: Operating system type, architecture and version
validations:
required: true

- type: input
id: cli-version
attributes:
label: JFrog CLI version
validations:
required: false

- type: input
id: xr-version
attributes:
label: JFrog Xray version
validations:
required: false
2 changes: 1 addition & 1 deletion client/src/pages/Scan.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Box, styled, Typography, SelectChangeEvent, CircularProgress, Button, useTheme } from '@mui/material';
import { Box, styled, Typography, CircularProgress, Button, useTheme } from '@mui/material';
import { useEffect, useState } from 'react';

import Select from '../components/Select';
Expand Down
2 changes: 1 addition & 1 deletion host/unix/runcli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LOG_FILE_PATH=$LOGS_DIR/jfrog-docker-desktop-extension.$(date -n +"%Y-%m-%d.%H-%

export JFROG_CLI_HOME_DIR=$HOME_DIR
export JFROG_CLI_USER_AGENT=jfrog-docker-extension
export JFROG_CLI_LOG_LEVEL=INFO
export JFROG_CLI_LOG_LEVEL=DEBUG
export CI=true

if [ ! -d $LOGS_DIR ]
Expand Down
2 changes: 1 addition & 1 deletion host/windows/runcli.bat
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set LOGS_DIR=%HOME_DIR%\logs

set JFROG_CLI_HOME_DIR=%HOME_DIR%
set JFROG_CLI_USER_AGENT=jfrog-docker-extension
set JFROG_CLI_LOG_LEVEL=INFO
set JFROG_CLI_LOG_LEVEL=DEBUG
set CI=true

if not exist %LOGS_DIR% mkdir %LOGS_DIR%
Expand Down

0 comments on commit 837ecc5

Please sign in to comment.