diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 31794dc..d5e6515 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -15,10 +15,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.8.2 +version: 0.9.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.8.2" +appVersion: "0.9.0" diff --git a/helm/Dockerfile b/helm/Dockerfile index 35b0f3b..8c8fa06 100644 --- a/helm/Dockerfile +++ b/helm/Dockerfile @@ -1,14 +1,14 @@ # Dockerfile for HWITW # Build from the root of the git repo with: -# nerdctl build -t ghcr.io/nceas/hwitw:0.7.0 -f helm/Dockerfile ./src +# docker build -t ghcr.io/nceas/hwitw:0.9.0 -f helm/Dockerfile ./src FROM python:3.9 WORKDIR /app -RUN groupadd -r hwitw && useradd -r -g hwitw hwitw +RUN groupadd -g 1004 datateam && useradd -m -u 1065 -g 1004 -s /bin/bash hwitw COPY website/hwitw_requirements.txt . COPY cdstotile/requirements.txt . -RUN pip install --no-cache-dir --upgrade -r hwitw_requirements.txt -RUN pip install --no-cache-dir --upgrade -r requirements.txt -USER hwitw:hwitw +RUN pip install --upgrade -r hwitw_requirements.txt +RUN pip install --upgrade -r requirements.txt +USER hwitw:datateam COPY ./website . COPY ./cdstotile /cdstotile ENV PORT 5000 diff --git a/helm/values.yaml b/helm/values.yaml index 8b10f0d..53902e5 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -15,11 +15,11 @@ env: CDS_DOWNLOAD_DIR: /var/data/hwitw/input DATA_OUTPUT_DIR: /var/data/hwitw/output # CDS_START_YEAR defaults to current year if not set in environment - # CDS_START_YEAR: 1950 + CDS_START_YEAR: 2022 persistence: enabled: true - claimName: hwitw-hwitw-pvc + claimName: hwitw-data mountPath: /var/data/hwitw imagePullSecrets: []