diff --git a/stable/calibre/5.0.9/CHANGELOG.md b/stable/calibre/5.0.10/CHANGELOG.md
similarity index 92%
rename from stable/calibre/5.0.9/CHANGELOG.md
rename to stable/calibre/5.0.10/CHANGELOG.md
index 0f4ed2324f..22038eedaa 100644
--- a/stable/calibre/5.0.9/CHANGELOG.md
+++ b/stable/calibre/5.0.10/CHANGELOG.md
@@ -1,6 +1,15 @@
# Changelog
+
+### [calibre-5.0.10](https://github.com/truecharts/apps/compare/calibre-5.0.9...calibre-5.0.10) (2022-01-11)
+
+#### Fix
+
+* Replace deprecated env's and fix port ([#1689](https://github.com/truecharts/apps/issues/1689))
+
+
+
### [calibre-5.0.9](https://github.com/truecharts/apps/compare/calibre-5.0.8...calibre-5.0.9) (2022-01-04)
@@ -88,12 +97,3 @@
### [calibre-5.0.0](https://github.com/truecharts/apps/compare/calibre-web-9.0.19...calibre-5.0.0) (2021-12-11)
-
-#### Feat
-
-* move user/pass/secrets/keys from `env` to `secret` ([#1501](https://github.com/truecharts/apps/issues/1501))
-
-#### Fix
-
-* remove `UMASK` as this is taken care from common ([#1503](https://github.com/truecharts/apps/issues/1503))
-
diff --git a/stable/calibre/5.0.9/CONFIG.md b/stable/calibre/5.0.10/CONFIG.md
similarity index 100%
rename from stable/calibre/5.0.9/CONFIG.md
rename to stable/calibre/5.0.10/CONFIG.md
diff --git a/stable/calibre/5.0.9/Chart.lock b/stable/calibre/5.0.10/Chart.lock
similarity index 78%
rename from stable/calibre/5.0.9/Chart.lock
rename to stable/calibre/5.0.10/Chart.lock
index ea3e541daf..8bee6f569c 100644
--- a/stable/calibre/5.0.9/Chart.lock
+++ b/stable/calibre/5.0.10/Chart.lock
@@ -3,4 +3,4 @@ dependencies:
repository: https://truecharts.org
version: 8.10.2
digest: sha256:7ded42c1a558931bd6b9e4b585e7f1a6c96709256b3ec39317be9049c07bf96e
-generated: "2022-01-04T20:15:05.622915432Z"
+generated: "2022-01-11T12:19:21.563155812Z"
diff --git a/stable/calibre/5.0.9/Chart.yaml b/stable/calibre/5.0.10/Chart.yaml
similarity index 97%
rename from stable/calibre/5.0.9/Chart.yaml
rename to stable/calibre/5.0.10/Chart.yaml
index ef26a17db3..2bab8c99fb 100644
--- a/stable/calibre/5.0.9/Chart.yaml
+++ b/stable/calibre/5.0.10/Chart.yaml
@@ -18,7 +18,7 @@ name: calibre
sources:
- https://hub.docker.com/r/linuxserver/calibre/
- https://github.com/kovidgoyal/calibre/
-version: 5.0.9
+version: 5.0.10
annotations:
truecharts.org/catagories: |
- media
diff --git a/stable/calibre/5.0.9/README.md b/stable/calibre/5.0.10/README.md
similarity index 100%
rename from stable/calibre/5.0.9/README.md
rename to stable/calibre/5.0.10/README.md
diff --git a/stable/calibre/5.0.9/app-readme.md b/stable/calibre/5.0.10/app-readme.md
similarity index 100%
rename from stable/calibre/5.0.9/app-readme.md
rename to stable/calibre/5.0.10/app-readme.md
diff --git a/stable/calibre/5.0.9/charts/common-8.10.2.tgz b/stable/calibre/5.0.10/charts/common-8.10.2.tgz
similarity index 100%
rename from stable/calibre/5.0.9/charts/common-8.10.2.tgz
rename to stable/calibre/5.0.10/charts/common-8.10.2.tgz
diff --git a/stable/calibre/5.0.9/helm-values.md b/stable/calibre/5.0.10/helm-values.md
similarity index 51%
rename from stable/calibre/5.0.9/helm-values.md
rename to stable/calibre/5.0.10/helm-values.md
index 950b60957d..932df8cf0c 100644
--- a/stable/calibre/5.0.9/helm-values.md
+++ b/stable/calibre/5.0.10/helm-values.md
@@ -11,20 +11,25 @@ You will, however, be able to use all values referenced in the common chart here
| Key | Type | Default | Description |
|-----|------|---------|-------------|
-| env | object | See below | environment variables. See [image docs](https://docs.linuxserver.io/images/docker-calibre#environment-variables-e) for more details. |
-| env.CLI_ARGS | string | `nil` | Optionally pass cli start arguments to calibre. |
-| env.PUID | int | `568` | Specify the user ID the application will run as |
-| env.TZ | string | `"UTC"` | Set the container timezone |
-| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
-| image.repository | string | `"tccr.io/truecharts/calibre"` | image repository |
-| image.tag | string | `"v5.32.0-ls138@sha256:a7c6272300628eb747dc129001aef8bc53d9b462ebe6b4953de904a2a5e15c8e"` | image tag |
-| persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
+| env.CLI_ARGS | string | `nil` | |
+| env.PUID | int | `568` | |
+| env.TZ | string | `"UTC"` | |
+| image.pullPolicy | string | `"IfNotPresent"` | |
+| image.repository | string | `"tccr.io/truecharts/calibre"` | |
+| image.tag | string | `"v5.32.0-ls138@sha256:a7c6272300628eb747dc129001aef8bc53d9b462ebe6b4953de904a2a5e15c8e"` | |
+| persistence.config.enabled | bool | `true` | |
+| persistence.config.mountPath | string | `"/config"` | |
+| persistence.varrun.enabled | bool | `true` | |
| podSecurityContext.runAsGroup | int | `0` | |
| podSecurityContext.runAsUser | int | `0` | |
-| secret.GUAC_PASS | string | `""` | Password's md5 hash for the calibre gui |
-| secret.GUAC_USER | string | `""` | Username for the calibre gui |
+| secret.PASSWORD | string | `""` | |
| securityContext.readOnlyRootFilesystem | bool | `false` | |
| securityContext.runAsNonRoot | bool | `false` | |
-| service | object | See values.yaml | Configures service settings for the chart. |
+| service.main.ports.main.port | int | `8084` | |
+| service.main.ports.main.targetPort | int | `8080` | |
+| service.webserver.enabled | bool | `true` | |
+| service.webserver.ports.webserver.enabled | bool | `true` | |
+| service.webserver.ports.webserver.port | int | `8081` | |
+| service.webserver.ports.webserver.targetPort | int | `8081` | |
All Rights Reserved - The TrueCharts Project
diff --git a/stable/calibre/5.0.10/ix_values.yaml b/stable/calibre/5.0.10/ix_values.yaml
new file mode 100644
index 0000000000..ac8143df9a
--- /dev/null
+++ b/stable/calibre/5.0.10/ix_values.yaml
@@ -0,0 +1,41 @@
+image:
+ repository: tccr.io/truecharts/calibre
+ tag: v5.32.0-ls138@sha256:a7c6272300628eb747dc129001aef8bc53d9b462ebe6b4953de904a2a5e15c8e
+ pullPolicy: IfNotPresent
+
+securityContext:
+ readOnlyRootFilesystem: false
+ runAsNonRoot: false
+
+podSecurityContext:
+ runAsUser: 0
+ runAsGroup: 0
+
+secret:
+ PASSWORD: ""
+
+env:
+ TZ: UTC
+ PUID: 568
+ CLI_ARGS:
+
+service:
+ main:
+ ports:
+ main:
+ port: 8084
+ targetPort: 8080
+ webserver:
+ enabled: true
+ ports:
+ webserver:
+ enabled: true
+ port: 8081
+ targetPort: 8081
+
+persistence:
+ config:
+ enabled: true
+ mountPath: "/config"
+ varrun:
+ enabled: true
diff --git a/stable/calibre/5.0.9/questions.yaml b/stable/calibre/5.0.10/questions.yaml
similarity index 98%
rename from stable/calibre/5.0.9/questions.yaml
rename to stable/calibre/5.0.10/questions.yaml
index d4e069c870..a11afa7671 100644
--- a/stable/calibre/5.0.9/questions.yaml
+++ b/stable/calibre/5.0.10/questions.yaml
@@ -180,19 +180,13 @@ questions:
schema:
type: dict
attrs:
- - variable: GUAC_USER
- label: "GUAC_USER"
- description: "Username for the calibre gui"
- schema:
- type: string
- default: "REPLACETHIS"
- - variable: GUAC_PASS
- label: "GUAC_PASS"
- description: "Password's md5 hash for the calibre gui"
+ - variable: PASSWORD
+ label: "PASSWORD"
+ description: "Optionally set a password for the gui."
schema:
type: string
private: true
- default: "REPLACETHIS"
+ default: ""
- variable: env
group: "Container Configuration"
label: "Image Environment"
@@ -373,7 +367,7 @@ questions:
description: "This port exposes the container port on the service"
schema:
type: int
- default: 10080
+ default: 8084
required: true
- variable: advanced
label: "Show Advanced settings"
@@ -1489,29 +1483,33 @@ questions:
attrs:
- variable: cpu
label: "CPU"
+ description: "1000m means 1 hyperthread. Detailed info: https://truecharts.org/manual/indepth/validation/"
schema:
type: string
default: "4000m"
valid_chars: '^(?!^0(\.0|m|)$)([0-9]+)(\.[0-9]|m?)$'
- variable: memory
- label: "Memory RAM"
+ label: "RAM"
+ description: "1Gi means 1 Gibibyte RAM. Detailed info: https://truecharts.org/manual/indepth/validation/"
schema:
type: string
default: "8Gi"
valid_chars: '^(?!^0(e[0-9]|[EPTGMK]i?|)$)([0-9]+)(|[EPTGMK]i?|e[0-9]+)$'
- variable: requests
- label: "Advanced Request minimum resources required"
+ label: "Minimum Resources Required (request)"
schema:
type: dict
attrs:
- variable: cpu
label: "CPU"
+ description: "1000m means 1 hyperthread. Detailed info: https://truecharts.org/manual/indepth/validation/"
schema:
type: string
default: "10m"
valid_chars: '^(?!^0(\.0|m|)$)([0-9]+)(\.[0-9]|m?)$'
- variable: memory
- label: "Memory RAM"
+ label: "RAM"
+ description: "1Gi means 1 Gibibyte RAM. Detailed info: https://truecharts.org/manual/indepth/validation/"
schema:
type: string
default: "50Mi"
diff --git a/stable/calibre/5.0.9/security.md b/stable/calibre/5.0.10/security.md
similarity index 99%
rename from stable/calibre/5.0.9/security.md
rename to stable/calibre/5.0.10/security.md
index dcbb4e1218..dfc295fd3d 100644
--- a/stable/calibre/5.0.9/security.md
+++ b/stable/calibre/5.0.10/security.md
@@ -319,6 +319,7 @@ hide:
|:----------------|:------------------:|:-----------:|:------------------:|:-------------:|-----------------------------------------|
| deep-extend | CVE-2018-3750 | CRITICAL | 0.4.2 | 0.5.1 | Expand...
https://github.com/advisories/GHSA-hr2v-3952-633q
https://hackerone.com/reports/311333
https://nodesecurity.io/advisories/612
https://nvd.nist.gov/vuln/detail/CVE-2018-3750
https://www.npmjs.com/advisories/612
|
| deep-extend | NSWG-ECO-408 | LOW | 0.4.2 | >=0.5.1 | Expand...
https://hackerone.com/reports/311333
|
+| postcss | CVE-2021-23382 | MEDIUM | 7.0.39 | 8.2.13 | Expand...
https://github.com/advisories/GHSA-566m-qj78-rww5
https://github.com/postcss/postcss/commit/2b1d04c867995e55124e0a165b7c6622c1735956
https://nvd.nist.gov/vuln/detail/CVE-2021-23382
https://snyk.io/vuln/SNYK-JAVA-ORGWEBJARSNPM-1255641
https://snyk.io/vuln/SNYK-JS-POSTCSS-1255640
|
**gobinary**
diff --git a/stable/calibre/5.0.9/templates/common.yaml b/stable/calibre/5.0.10/templates/common.yaml
similarity index 100%
rename from stable/calibre/5.0.9/templates/common.yaml
rename to stable/calibre/5.0.10/templates/common.yaml
diff --git a/stable/calibre/5.0.9/values.yaml b/stable/calibre/5.0.10/values.yaml
similarity index 100%
rename from stable/calibre/5.0.9/values.yaml
rename to stable/calibre/5.0.10/values.yaml
diff --git a/stable/calibre/5.0.9/ix_values.yaml b/stable/calibre/5.0.9/ix_values.yaml
deleted file mode 100644
index b3c034e4ed..0000000000
--- a/stable/calibre/5.0.9/ix_values.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-image:
- # -- image repository
- repository: tccr.io/truecharts/calibre
- # -- image tag
- tag: v5.32.0-ls138@sha256:a7c6272300628eb747dc129001aef8bc53d9b462ebe6b4953de904a2a5e15c8e
- # -- image pull policy
- pullPolicy: IfNotPresent
-
-securityContext:
- readOnlyRootFilesystem: false
- runAsNonRoot: false
-
-podSecurityContext:
- runAsUser: 0
- runAsGroup: 0
-
-secret:
- # -- Username for the calibre gui
- GUAC_USER: ""
- # -- Password's md5 hash for the calibre gui
- GUAC_PASS: ""
-# -- environment variables. See [image docs](https://docs.linuxserver.io/images/docker-calibre#environment-variables-e) for more details.
-# @default -- See below
-env:
- # -- Set the container timezone
- TZ: UTC
- # -- Specify the user ID the application will run as
- PUID: 568
- # -- Optionally pass cli start arguments to calibre.
- CLI_ARGS:
-
-# -- Configures service settings for the chart.
-# @default -- See values.yaml
-service:
- main:
- ports:
- main:
- port: 10080
- targetPort: 8080
- webserver:
- enabled: true
- ports:
- webserver:
- enabled: true
- port: 8081
- targetPort: 8081
-
-# -- Configure persistence settings for the chart under this key.
-# @default -- See values.yaml
-persistence:
- config:
- enabled: true
- mountPath: "/config"
- varrun:
- enabled: true