Merge pull request #135 from cfengine/master

Publish master changes since February (production)
cfengine · Jun 21, 2023 · 9d4e6aa · 9d4e6aa
2 parents 1dbbd2b + 3fe9535
commit 9d4e6aa
Show file tree

Hide file tree

Showing 12 changed files with 770 additions and 1,794 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,15 +1,15 @@
-FROM node:alpine AS build
+FROM node:18-alpine AS build
 ARG GITHUB_USERNAME_TOKEN
 WORKDIR /build-website
-ADD https://github.com/gohugoio/hugo/releases/download/v0.104.3/hugo_0.104.3_Linux-64bit.tar.gz hugo.tar.gz
-RUN echo "da45809872c2c3a318c277adcacd80d00f4e0cd4527640f67055beac3b642333  hugo.tar.gz" | sha256sum -c
+ADD https://github.com/gohugoio/hugo/releases/download/v0.112.6/hugo_0.112.6_Linux-64bit.tar.gz hugo.tar.gz
+RUN echo "623846db72d4c932a3b3ebc2914e993db3f1eee79da92cd5cbb39ddf3b22f871  hugo.tar.gz" | sha256sum -c
 RUN tar -zxvf hugo.tar.gz
-COPY ./ /build-website
-RUN npm i
-RUN npm i -g grunt-cli
-RUN grunt build
+COPY package-lock.json package.json ./
+RUN npm ci
+COPY . ./
+RUN npm run build
 RUN ./hugo -v
-RUN grunt create-modules-json
+RUN npm run create-modules-json
 RUN find public -type f -regex '^.*\.\(svg\|css\|html\|xml\)$' -size +1k -exec gzip -k '{}' \;
 
 FROM nginx:stable-alpine

diff --git a/Gruntfile.js b/Gruntfile.js
diff --git a/README.md b/README.md
@@ -1,11 +1,7 @@
-# CFEngine Build Website Repository
+# CFEngine Build website
 
 The website lists available modules from the index and gives you easy commands to copy.
 
-The CFEngine Build System (cfbs) comes with **no warranty** and is **not supported**.
-This is a work in progress, everything will change.
-Use at your own risk!
-
 ## Deployment workflow
 
 1. Create your own branch / fork based on master branch.
@@ -26,9 +22,9 @@ Use at your own risk!
 
 ```
 export GITHUB_USERNAME_TOKEN='place githubName:token here'
-npm install
-npm install -g grunt-cli
-grunt build
+npm ci
+npm run build
+npm run create-modules-json
 hugo
 ```
 
@@ -53,7 +49,7 @@ docker build --build-arg GITHUB_USERNAME_TOKEN --tag cfbs-website -f Dockerfile
 docker run -p 80:80 -p 81:81 --volume /path/to/volume:/home/proxy --name cfbs-website --rm cfbs-website
 ```
 
-## CFEngine Build Repositories
+## CFEngine Build repositories
 
 * [build-index](https://github.com/cfengine/build-index) - Index of modules
 * [build-website](https://github.com/cfengine/build-website) - Website