Skip to content
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

fix: logs file path issue fix and docker file update for non root user #3024

Merged
merged 9 commits into from
Mar 2, 2023

Conversation

gireesh-naidu
Copy link
Member

@gireesh-naidu gireesh-naidu commented Feb 22, 2023

Description

made logs base file path configurable.
Fixes https://dev.azure.com/DevtronLabs/Devtron/_workitems/edit/2174/

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

Checklist:

  • The title of the PR states what changed and the related issues number (used for the release note).
  • Does this PR requires documentation updates?
  • I've updated documentation as required by this PR.
  • I have performed a self-review of my own code.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have tested it for all user roles.
  • I have added all the required unit/api test cases.

Does this PR introduce a user-facing change?


rupinSec and others added 7 commits February 3, 2023 14:39
* added non root user support in Dockerfile

* minor change for dockerfileEA

---------

Co-authored-by: Rupin Solanki <rupinsolanki@Rupins-MacBook-Pro.local>
Co-authored-by: Rupin Solanki <rupinsolanki@ip-192-168-1-4.us-east-2.compute.internal>
@gireesh-naidu gireesh-naidu changed the title Logs file path issue dockerfile nonrootuser fix: logs file path issue dockerfile nonrootuser Feb 22, 2023
@gireesh-naidu gireesh-naidu changed the title fix: logs file path issue dockerfile nonrootuser fix: logs file path issue fix and docker file update for non root user Feb 22, 2023
util/helper.go Outdated
@@ -208,3 +209,16 @@ func InterfaceToMapAdapter(resp interface{}) map[string]interface{} {
}
return dat
}

type BaseLogLocationConfig struct {
BaseLogLocationPath string `env:"BASE_LOG_LOCATION_PATH" envDefault:"home/devtron/"`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

put this in ciConfig and cdConfig and read it from there.

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@rupinSec
Copy link
Contributor

rupinSec commented Mar 2, 2023

Dockerfile changes are also reviewed

@gireesh-naidu gireesh-naidu requested a review from rupinSec March 2, 2023 06:57
Copy link
Contributor

@rupinSec rupinSec left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dockerfile changes approved

@gireesh-naidu gireesh-naidu merged commit f193494 into main Mar 2, 2023
@gireesh-naidu gireesh-naidu deleted the logs_file_path_issue-dockerfile-nonrootuser branch March 2, 2023 07:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants