v1.12 official release

.github/workflows/dockerbuild.yml

@@ -19,7 +19,8 @@ jobs:
     - name: Build the Docker image
       run: docker build . --file ./Dockerfile --tag localbuild/openrmf-web:latest
     - name: Container image scan
-      uses: Azure/container-scan@v0
+      uses: anchore/scan-action@v3
       with:
-        image-name: localbuild/openrmf-web:latest
-        severity-threshold: CRITICAL
+        image: localbuild/openrmf-web:latest
+        fail-build: false
+        output-format: table

.gitignore

@@ -45,10 +45,10 @@ test.ckl
 
 
 # Jekyll Help Files
-help/vendor/*
+wwwroot/help/vendor/*
 
 Gemfile.lock
 
-help/.bundle/*
+wwwroot/help/.bundle/*
 
-help/.jekyll-cache/*
+wwwroot/help/.jekyll-cache/*

Dockerfile

@@ -1,22 +1,22 @@
-FROM nginxinc/nginx-unprivileged:1.25-alpine
+FROM nginxinc/nginx-unprivileged:1.27.0-alpine
 # Fix for broken build on Docker in GH is to put RUN true between multiple COPY statements :(
 RUN true
-COPY *.html /usr/share/nginx/html/
+COPY ./wwwroot/*.html /usr/share/nginx/html/
 RUN true
-COPY ./reports/*.html /usr/share/nginx/html/reports/
+COPY ./wwwroot/reports/*.html /usr/share/nginx/html/reports/
 RUN true
-COPY ./js/apis.js /usr/share/nginx/html/js/apis.js
+COPY ./wwwroot/js/apis.js /usr/share/nginx/html/js/apis.js
 RUN true
-COPY ./js/auth.js /usr/share/nginx/html/js/auth.js
+COPY ./wwwroot/js/auth.js /usr/share/nginx/html/js/auth.js
 RUN true
-COPY ./js/jquery.blockUI.js /usr/share/nginx/html/js/jquery.blockUI.js
+COPY ./wwwroot/js/jquery.blockUI.js /usr/share/nginx/html/js/jquery.blockUI.js
 RUN true
-COPY ./js/moment.min.js /usr/share/nginx/html/js/moment.min.js
+COPY ./wwwroot/js/moment.min.js /usr/share/nginx/html/js/moment.min.js
 RUN true
-COPY ./js/openrmf.min.js /usr/share/nginx/html/js/openrmf.js
+COPY ./wwwroot/js/openrmf.min.js /usr/share/nginx/html/js/openrmf.js
 RUN true
-COPY ./includes/ /usr/share/nginx/html/includes/
+COPY ./wwwroot/includes/ /usr/share/nginx/html/includes/
 RUN true
-COPY ./assets/ /usr/share/nginx/html/assets/
+COPY ./wwwroot/assets/ /usr/share/nginx/html/assets/
 RUN true
-COPY ./help/_site/ /usr/share/nginx/html/help/
+COPY ./wwwroot/help/_site/ /usr/share/nginx/html/help/

Dockerfile.privileged

@@ -0,0 +1,22 @@
+FROM nginx:1.27.0-alpine
+# Fix for broken build on Docker in GH is to put RUN true between multiple COPY statements :(
+RUN true
+COPY ./wwwroot/*.html /usr/share/nginx/html/
+RUN true
+COPY ./wwwroot/reports/*.html /usr/share/nginx/html/reports/
+RUN true
+COPY ./wwwroot/js/apis.js /usr/share/nginx/html/js/apis.js
+RUN true
+COPY ./wwwroot/js/auth.js /usr/share/nginx/html/js/auth.js
+RUN true
+COPY ./wwwroot/js/jquery.blockUI.js /usr/share/nginx/html/js/jquery.blockUI.js
+RUN true
+COPY ./wwwroot/js/moment.min.js /usr/share/nginx/html/js/moment.min.js
+RUN true
+COPY ./wwwroot/js/openrmf.min.js /usr/share/nginx/html/js/openrmf.js
+RUN true
+COPY ./wwwroot/includes/ /usr/share/nginx/html/includes/
+RUN true
+COPY ./wwwroot/assets/ /usr/share/nginx/html/assets/
+RUN true
+COPY ./wwwroot/help/_site/ /usr/share/nginx/html/help/

Makefile

@@ -1,15 +1,14 @@
-VERSION ?= 1.10.01
+VERSION ?= 1.12.00
 NAME ?= "openrmf-web"
 AUTHOR ?= "Dale Bingham"
-PORT_EXT ?= 9000
-PORT_INT ?= 80
 NO_CACHE ?= true
 DOCKERHUB_ACCOUNT ?= cingulara
 
 .PHONY: build docker latest run stop clean version dockerhub
 
 docker: 
 	docker build -f Dockerfile -t $(NAME)\:$(VERSION) --no-cache=$(NO_CACHE) .
+	docker build -f Dockerfile.privileged -t $(NAME)\:$(VERSION)-privileged --no-cache=$(NO_CACHE) .
 
 latest: 
 	docker build -f Dockerfile -t $(NAME)\:latest --no-cache=$(NO_CACHE) .
@@ -22,5 +21,7 @@ version:
 dockerhub:
 	docker tag $(NAME)\:$(VERSION) ${DOCKERHUB_ACCOUNT}\/$(NAME)\:$(VERSION)
 	docker push ${DOCKERHUB_ACCOUNT}\/$(NAME)\:$(VERSION)
+	docker tag $(NAME)\:$(VERSION)-privileged ${DOCKERHUB_ACCOUNT}\/$(NAME)\:$(VERSION)-privileged
+	docker push ${DOCKERHUB_ACCOUNT}\/$(NAME)\:$(VERSION)-privileged
 
 DEFAULT: latest