Updated build script and renovate configuration

NethServer · Jan 10, 2023 · bd2a9c9 · bd2a9c9
1 parent f30ee6b
commit bd2a9c9
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 4 deletions.
diff --git a/.github/workflows/build-apidoc.yml b/.github/workflows/build-apidoc.yml
@@ -6,6 +6,10 @@ on:
       - '**/validate-input.json'
       - '**/validate-output.json'
       - '**/validator-definitions.json'
+    branches-ignore:
+      - 'renovate/**'
+    tags:
+      - "**"
 
 jobs:
   build-apidoc:

diff --git a/.github/workflows/publish-images.yml b/.github/workflows/publish-images.yml
@@ -2,6 +2,10 @@ name: "Publish images"
 
 on:
   push:
+    branches-ignore:
+      - 'renovate/**'
+    tags:
+      - "**"
 
 permissions:
   packages: write

diff --git a/build-images.sh b/build-images.sh
@@ -3,7 +3,7 @@
 # Terminate on error
 set -e
 
-NC_VERSION=25
+NC_VERSION=25.0.2
 
 # Prepare variables for later use
 images=()
@@ -18,7 +18,7 @@ container=$(buildah from scratch)
 # Reuse existing nodebuilder-nextcloud container, to speed up builds
 if ! buildah containers --format "{{.ContainerName}}" | grep -q nodebuilder-nextcloud; then
     echo "Pulling NodeJS runtime..."
-    buildah from --name nodebuilder-nextcloud -v "${PWD}:/usr/src:Z" docker.io/library/node:lts-slim
+    buildah from --name nodebuilder-nextcloud -v "${PWD}:/usr/src:Z" docker.io/node:18.12.1-alpine
 fi
 
 echo "Build static UI files with node..."
@@ -32,7 +32,7 @@ buildah config --entrypoint=/ \
     --label="org.nethserver.authorizations=traefik@any:routeadm" \
     --label="org.nethserver.tcp-ports-demand=1" \
     --label="org.nethserver.rootfull=0" \
-    --label="org.nethserver.images=docker.io/redis:6-alpine docker.io/mariadb:10.5 docker.io/nginx:1.21-alpine ghcr.io/nethserver/nextcloud-app:${IMAGETAG}" \
+    --label="org.nethserver.images=docker.io/redis:6.2.8-alpine docker.io/mariadb:10.5.18 docker.io/nginx:1.21.6-alpine ghcr.io/nethserver/nextcloud-app:${IMAGETAG}" \
     "${container}"
 # Commit the image
 buildah commit "${container}" "${repobase}/${reponame}"
@@ -60,7 +60,7 @@ images+=("${nc_image}")
 #
 
 #
-# Setup CI when pushing to Github. 
+# Setup CI when pushing to Github.
 # Warning! docker::// protocol expects lowercase letters (,,)
 if [[ -n "${CI}" ]]; then
     # Set output value for Github Actions

diff --git a/renovate.json b/renovate.json
@@ -2,5 +2,78 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:base"
+  ],
+  "ignorePaths": [
+    "**/ui/**"
+  ],
+  "regexManagers": [
+    {
+      "fileMatch": [
+        "build-images.sh"
+      ],
+      "matchStrings": [
+        "NC_VERSION=(?<currentValue>[^\\s]+)"
+      ],
+      "depNameTemplate": "nextcloud",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": [
+        "build-images.sh"
+      ],
+      "matchStrings": [
+        "docker\\.io\/node:(?<currentValue>[^\\s]+)"
+      ],
+      "depNameTemplate": "node",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": [
+        "build-images.sh"
+      ],
+      "matchStrings": [
+        "docker\\.io\/redis:(?<currentValue>[^\\s]+)"
+      ],
+      "depNameTemplate": "redis",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": [
+        "build-images.sh"
+      ],
+      "matchStrings": [
+        "docker\\.io\/mariadb:(?<currentValue>[^\\s]+)"
+      ],
+      "depNameTemplate": "mariadb",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": [
+        "build-images.sh"
+      ],
+      "matchStrings": [
+        "docker\\.io\/nginx:(?<currentValue>[^\\s]+)"
+      ],
+      "depNameTemplate": "nginx",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": [
+        "test-module.sh"
+      ],
+      "matchStrings": [
+        "ghcr\\.io\/marketsquare\/robotframework-browser\/rfbrowser-stable:(?<currentValue>[^\\s]+)"
+      ],
+      "depNameTemplate": "ghcr.io/marketsquare/robotframework-browser/rfbrowser-stable",
+      "datasourceTemplate": "docker"
+    }
+  ],
+  "packageRules": [
+    {
+      "matchPackageNames": [
+        "node"
+      ],
+      "allowedVersions": "<= 18"
+    }
   ]
 }