Merge pull request #496 from turbo124/master

Minor fixes for paths
2026-01-01 20:17:26 +01:00 · 2023-02-10 07:58:10 +11:00 · 2023-02-10 07:57:47 +11:00 · 2023-02-09 19:20:30 +11:00 · 2023-02-08 23:30:51 +11:00 · 2023-01-14 09:35:35 +11:00
10 changed files with 74 additions and 42 deletions
--- a/.github/workflows/release-chart.yaml
+++ b/.github/workflows/release-chart.yaml
@@ -12,21 +12,23 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0

      - name: Configure Git
        run: |
          git config user.name "$GITHUB_ACTOR"
          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"

-      - uses: azure/setup-helm@v1
-        id: install
+      - name: Set up Helm
+        uses: azure/setup-helm@v3

      - name: Add Helm repos
        run: |
          helm repo add bitnami https://charts.bitnami.com/bitnami

      - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.2.1
+        uses: helm/chart-releaser-action@v1.4.1
        env:
          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
--- a/.github/workflows/test-charts.yaml
+++ b/.github/workflows/test-charts.yaml
@@ -17,14 +17,15 @@ jobs:
          fetch-depth: 0

      - name: Set up Helm
-        uses: azure/setup-helm@v1
+        uses: azure/setup-helm@v3

-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
        with:
-          python-version: 3.7
+          python-version: "3.9"
+          check-latest: true

      - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.0.1
+        uses: helm/chart-testing-action@v2.3.1

      - name: Run chart-testing (list-changed)
        id: list-changed
@@ -41,7 +42,7 @@ jobs:
      - name: Run chart-testing (lint)
        run: ct lint --config .github/ct-lint.yaml

-  kubeval-chart:
+  kubeconform-chart:
    runs-on: ubuntu-latest
    needs:
      - lint-chart
@@ -49,39 +50,44 @@ jobs:
      matrix:
        chart: ${{ fromJson(needs.lint-chart.outputs.matrix) }}
        k8s:
-          - v1.19.11
-          - v1.20.7
-          - v1.21.2
+          - "1.25.5"
+          - "1.24.9"
+          - "1.23.15"
    steps:
      - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0

      - name: Update Helm depdendencies
        env:
          CHART_DIR: ${{ matrix.chart }}
        run: |
          helm dependency update "${CHART_DIR}"
-          mkdir kubeval
-          helm template "${CHART_DIR}" > kubeval/combined.yaml
+          mkdir tmp
+          helm template "${CHART_DIR}" > tmp/combined.yaml

-      - name: Run kubeval
-        uses: instrumenta/kubeval-action@master
+      - uses: yokawasa/action-setup-kube-tools@v0.9.2
        with:
-          files: kubeval
-          version: ${{ matrix.k8s }}
+          setup-tools: |
+            kubeconform
+
+      - name: Run kubeconform
+        if: ${{ matrix.k8s }}
+        run: kubeconform -kubernetes-version ${{ matrix.k8s }} tmp/combined.yaml

  install-chart:
    name: install-chart
    runs-on: ubuntu-latest
    needs:
      - lint-chart
-      - kubeval-chart
+      - kubeconform-chart
    strategy:
      matrix:
        k8s:
-          - v1.19.11
-          - v1.20.7
-          - v1.21.2
+          - v1.25.3
+          - v1.24.7
+          - v1.23.13
    steps:
      - name: Checkout
        uses: actions/checkout@v2
@@ -89,16 +95,17 @@ jobs:
          fetch-depth: 0

      - name: Create kind ${{ matrix.k8s }} cluster
-        uses: helm/kind-action@v1.2.0
+        uses: helm/kind-action@v1.4.0
        with:
          node_image: kindest/node:${{ matrix.k8s }}

-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
        with:
-          python-version: 3.7
+          python-version: "3.9"
+          check-latest: true

      - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.0.1
+        uses: helm/chart-testing-action@v2.3.1

      - name: Run chart-testing (install)
        run: ct install --config .github/ct-install.yaml
--- a/alpine/5/Dockerfile
+++ b/alpine/5/Dockerfile
@@ -9,6 +9,8 @@ FROM --platform=$BUILDPLATFORM node:lts-alpine as build
 ARG INVOICENINJA_VERSION
 ADD https://github.com/invoiceninja/invoiceninja/tarball/v$INVOICENINJA_VERSION /tmp/ninja.tar.gz

+RUN set -eux; apk add curl unzip
+
 # Extract Invoice Ninja
 RUN mkdir -p /var/www/app \
    && tar --strip-components=1 -xf /tmp/ninja.tar.gz -C /var/www/app/ \
@@ -16,6 +18,13 @@ RUN mkdir -p /var/www/app \
    && mv /var/www/app/.env.example /var/www/app/.env \
    && rm -rf /var/www/app/docs /var/www/app/tests

+# Download and extract the latest react application
+RUN curl -LGO $(curl https://api.github.com/repos/turbo124/ui-1/releases/latest | grep "browser_download_url" | awk '{ print $2 }' | sed 's/,$//' | sed 's/"//g');
+RUN cp invoiceninja-react.zip /tmp/invoiceninja-react.zip
+RUN unzip /tmp/invoiceninja-react.zip 
+RUN cp -r dist/react/* /var/www/app/public/react/
+# Download and extract the latest react application
+# 
 WORKDIR /var/www/app/

 # Install node packages
--- a/alpine/5/rootfs/docker-entrypoint-init.d/10-init-in.sh
+++ b/alpine/5/rootfs/docker-entrypoint-init.d/10-init-in.sh
@@ -12,3 +12,4 @@ if [[ ! -z "${IN_PASSWORD}" ]]; then
 fi

 php artisan ninja:create-account $email $password
+php artisan ninja:react
--- a/charts/invoiceninja/Chart.lock
+++ b/charts/invoiceninja/Chart.lock
@@ -1,15 +1,15 @@
 dependencies:
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.7.0
+  version: 2.2.2
 - name: nginx
  repository: https://charts.bitnami.com/bitnami
-  version: 9.3.7
+  version: 13.2.20
 - name: mariadb
  repository: https://charts.bitnami.com/bitnami
-  version: 9.3.17
+  version: 11.4.2
 - name: redis
  repository: https://charts.bitnami.com/bitnami
-  version: 14.7.1
-digest: sha256:495d7cedf5284501249705101853f33d1bb479b35ce11a518631682cdb38c15f
-generated: "2021-07-16T00:53:22.586326+08:00"
+  version: 16.13.2
+digest: sha256:da0dca54f32ca0465f89744d6247421ad13c907f09cd40fb21985c81888aaef1
+generated: "2022-12-23T12:54:52.476889+08:00"
--- a/charts/invoiceninja/Chart.yaml
+++ b/charts/invoiceninja/Chart.yaml
@@ -13,11 +13,11 @@ 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.9.2
+version: 0.10.1
 # 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.
-appVersion: 5.3.80
+appVersion: 5.5.49
 keywords:
  - invoiceninja
 home: https://invoiceninja.github.io/dockerfiles
@@ -29,19 +29,19 @@ dependencies:
    repository: https://charts.bitnami.com/bitnami
    tags:
      - bitnami-common
-    version: 1.x.x
+    version: 2.x.x
  - condition: nginx.enabled
    name: nginx
    repository: https://charts.bitnami.com/bitnami
-    version: 9.x.x
+    version: 13.x.x
  - condition: mariadb.enabled
    name: mariadb
    repository: https://charts.bitnami.com/bitnami
-    version: 9.3.x
+    version: 11.4.x
  - condition: redis.enabled
    name: redis
    repository: https://charts.bitnami.com/bitnami
-    version: 14.x.x
+    version: 16.x.x
 maintainers:
  - email: lwj5@hotmail.com
    name: lwj5
--- a/charts/invoiceninja/README.md
+++ b/charts/invoiceninja/README.md
@@ -360,6 +360,16 @@ If you have the ability to use `ReadWriteMany` persistent volume, you can choose

 ## Upgrading

+### To 0.10.0
+
+The following chart dependencies have been upgraded.
+- MariaDB 
+- Redis
+- Nginx
+- Bitnami common
+
+Please take note that this upgrade MariaDB from 10.5 to 10.6. Please backup your database before proceeding.
+
 ### To 0.8.0

 To improve the accessibility of this chart to regular users. Some of the defaults have been changed. This include:
--- a/charts/invoiceninja/templates/serverblock.yaml
+++ b/charts/invoiceninja/templates/serverblock.yaml
@@ -15,6 +15,7 @@ data:
  server-block.conf: |-
    server {
        listen 8080 default_server;
+        listen [::]:8080 default_server;
        server_name _;

        root /app;
--- a/charts/invoiceninja/values.yaml
+++ b/charts/invoiceninja/values.yaml
@@ -18,7 +18,7 @@
 image:
  registry: docker.io
  repository: invoiceninja/invoiceninja
-  tag: 5.3.80
+  tag: 5.5.49
  ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
  ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
  ##
@@ -298,7 +298,7 @@ http:
  image:
    registry: docker.io
    repository: bitnami/nginx
-    tag: 1.21.1-debian-10-r0
+    tag: 1.22.1-debian-11-r21
    ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
    ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
    ##
--- a/config/nginx/in-vhost.conf
+++ b/config/nginx/in-vhost.conf
@@ -1,7 +1,9 @@
 server {
    listen 80 default_server;
    server_name _;
-
+    
+    server_tokens off;
+    
    client_max_body_size 100M;

    root /var/www/app/public/;
Author	SHA1	Message	Date
David Bomba	8db5c792a8	Merge pull request #496 from turbo124/master Minor fixes for paths	2023-02-10 07:58:10 +11:00
David Bomba	b3768cbed3	Minor fixes for paths	2023-02-10 07:57:47 +11:00
David Bomba	25d2d1d271	Merge pull request #494 from turbo124/master Build docker with react bundled	2023-02-09 19:20:30 +11:00
David Bomba	abfb5d1338	Build docker with react bundled	2023-02-08 23:30:51 +11:00
David Bomba	300c2d236d	Merge pull request #488 from Xenion1987/patch-1 disable nginx version output	2023-01-14 09:35:35 +11:00
Marvin Moldenhauer	56e451ea8b	disable nginx version output Add `server_tokens off;` to not display nginx version in HTTP headers output. server_tokens on: server: nginx/1.23.3 server_tokens on: server: nginx	2023-01-13 18:37:56 +01:00
Ween Jiann	ad3ffc227d	Add ipv6 support to chart (#484 )	2022-12-24 14:48:36 +08:00
Ween Jiann	e64db79c75	Re-trigger chart release (#483 )	2022-12-23 12:58:42 +08:00
Ween Jiann	5fcad81fc2	Update release chart action (#482 )	2022-12-23 12:53:04 +08:00
Ween Jiann	2e383ef879	Update chart dependencies (#476 ) * Update chart dependencies * Update IN version * Update lock file * Update README.md	2022-12-23 12:47:07 +08:00
Ween Jiann	bb6b3dc1e8	Update k8s versions for chart testing action (#481 )	2022-12-23 12:36:03 +08:00
Ween Jiann	4a7b28f1d0	Fix: remove v prefix from kubeconform (#480 )	2022-12-23 12:29:23 +08:00
Ween Jiann	1699ddde65	Fix: kind versions in chart testing (#479 )	2022-12-23 00:32:00 +08:00
Ween Jiann	63431878b8	Fix: wrong name in chart testing action (#478 )	2022-12-23 00:24:51 +08:00
Ween Jiann	03cc1ff548	Update chart testing action (#477 )	2022-12-23 00:15:18 +08:00