From 4550a1ccce4c46d123c6bf94a02e15fe3977205c Mon Sep 17 00:00:00 2001 From: Gravity6909 <161408315+Gravity6909@users.noreply.github.com> Date: Tue, 27 Feb 2024 11:44:08 -0800 Subject: [PATCH] fix(xmrig): update env for xmrig (#18696) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [x] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** Fixes env variables to work properly with docker image **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [x] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [ ] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --------- Signed-off-by: Gravity6909 <161408315+Gravity6909@users.noreply.github.com> Signed-off-by: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Co-authored-by: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> --- charts/stable/xmrig/Chart.yaml | 2 +- charts/stable/xmrig/questions.yaml | 49 ++++++++++-------------------- charts/stable/xmrig/values.yaml | 11 +++---- 3 files changed, 21 insertions(+), 41 deletions(-) diff --git a/charts/stable/xmrig/Chart.yaml b/charts/stable/xmrig/Chart.yaml index 1d5ce395c50..1da1b37d64b 100644 --- a/charts/stable/xmrig/Chart.yaml +++ b/charts/stable/xmrig/Chart.yaml @@ -33,4 +33,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/xmrig - https://hub.docker.com/r/cooleye72/xmrig type: application -version: 6.1.3 +version: 6.1.4 diff --git a/charts/stable/xmrig/questions.yaml b/charts/stable/xmrig/questions.yaml index 4515ac82968..73769047ccd 100644 --- a/charts/stable/xmrig/questions.yaml +++ b/charts/stable/xmrig/questions.yaml @@ -13,21 +13,22 @@ questions: additional_attrs: true type: dict attrs: - - variable: POOL - label: "POOL" - description: "Address for your mining pool. Eg. xmr-au1.nanopool.org14444" + - variable: POOL_URL + label: "Pool Url" + description: "Address for your mining pool. Eg. gulf.moneroocean.stream:10128" schema: type: string - default: "xmr-au1.nanopool.org:14444" - - variable: WALLET - label: "WALLET" - description: "Wallet address for receiving mined coin. If you are privacy conscious, you can redact this in logs posted to the support thread by replacing it with WALLET. If you use Monero, sharing this address will only allow people to send you Monero and possibly identify you if you send someone else Monero, but being a privacy oriented coin its entirely up to you." + default: "gulf.moneroocean.stream:10128" + - variable: YOUR_ADDRESS + label: "Wallet Address" + description: "Wallet address for receiving mined coin." schema: type: string - default: "84e8UJvXHDGVfE5HZDQfhn3Kh3RGJKebz31G7D4H24TLPMe9x7bQLBw8iyBhNx9USXB8MhvhBe3DyVW1LcuVAf4jBiADNLw" - - variable: WORKER - label: "WORKER" - description: "Enter a name for your worker. Some pools use a hidden option with this (Nanopool included) that allows you to change your payment threshold on their website. If you want to use this option, you can change this to workernameemail, eg. TrueNAStest@example.com, where test@example.com is your own email address. This option is basically a password. Please take note that if you post your logs in the support thread you would be best to redact the email address, eg. change out the instances of your email with @. to prevent your email address being posted in a public forum." + private: true + default: "" + - variable: YOUR_WORKER_NAME + label: "Worker Name" + description: "Enter a name for your worker." schema: type: string default: "TrueNAS" @@ -37,30 +38,12 @@ questions: schema: type: string default: "--no-color " - - variable: DONATE - label: "DONATE" - description: "% that you would like to donate. Enter a whole number between 0-100, no symbols." + - variable: ALGO_MODE + label: "Algorithm" + description: "Select a coin to mine, eg. rx/0 See https://xmrig.com/docs/algorithms for more info." schema: type: string - default: "1" - - variable: FEE - label: "FEE" - description: "Select where you would like to donate the developer fee. Options are dev-fee, lnxd-fee and no-fee." - schema: - type: string - default: "lnxd-fee" - - variable: COIN - label: "COIN" - description: "Select a coin to mine. Options are monero, arqma and dero. You can optionally disable this to use the --algo flag in Additional XMRig Arguments by setting this to x." - schema: - type: string - default: "monero" - - variable: DRIVERV - label: "DRIVERV" - description: "Please note while you can mine Monero with a GPU, it is designed to be mined with a CPU. If you have a GPU, please confirm it is not more profitable to mine a currency that does not intentionally bottleneck GPU mining. Set 20.20 for AMD, other options are for testing purposes only (18.20, 20.45, 20.50). If you have an Nvidia card, enter CUDA Please note that this container will not work with both AMD Drivers and Cuda installed at the same time. if you want to do this, please set this container up for one and create a second, separate container for the other. Please also note that if you use the CUDA value, the container will end up around 3gb in size and take a very long time to start after updates." - schema: - type: string - default: "" + default: "rx/0" # Include{containerBasic} # Include{containerAdvanced} # Include{containerConfig} diff --git a/charts/stable/xmrig/values.yaml b/charts/stable/xmrig/values.yaml index 61bb7aa7ac5..2c8ad57d723 100644 --- a/charts/stable/xmrig/values.yaml +++ b/charts/stable/xmrig/values.yaml @@ -24,13 +24,10 @@ workload: main: env: ADDITIONAL: "--no-color " - COIN: monero - DONATE: "1" - DRIVERV: "" - FEE: lnxd-fee - POOL: xmr-au1.nanopool.org:14444 - WALLET: 84e8UJvXHDGVfE5HZDQfhn3Kh3RGJKebz31G7D4H24TLPMe9x7bQLBw8iyBhNx9USXB8MhvhBe3DyVW1LcuVAf4jBiADNLw - WORKER: TrueNAS + ALGO_MODE: rx/0 + POOL_URL: gulf.moneroocean.stream:10128 + YOUR_ADDRESS: "" + YOUR_WORKER_NAME: TrueNAS probes: liveness: enabled: false