Add docker private actions support buildx

.github/workflows/docker-private.yml

@@ -12,6 +12,7 @@ jobs:
     env:
       REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
     steps:
+      - uses: docker/setup-buildx-action@v1
       - uses: actions/checkout@v1
       - name: Sign-in to Private Registry "${REGISTRY}"
         run: docker login $REGISTRY -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/docker-public.yml

@@ -3,7 +3,7 @@ name: Docker CI Public
 on:
   push:
     branches:
-      - 'main'
+      - main
 
 jobs:
   docker:

Dockerfile

@@ -13,13 +13,14 @@ ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
 ENV NODE_ENV production
 ENV ACCEPT_HIGHCHARTS_LICENSE="YES"
 
-RUN npm i -g highcharts-export-server@latest
+RUN npm i -g @cubetiq/highcharts-export-server@latest
 
 WORKDIR /usr/share/fonts/truetype
 ADD fonts/* ./
 RUN fc-cache -fv
 
 WORKDIR /
+ADD entrypoint.sh /entrypoint.sh
 
-EXPOSE 8080
-ENTRYPOINT ["highcharts-export-server", "--enableServer", "1", "--port", "8080"]
+EXPOSE ${PORT:-8080}
+ENTRYPOINT ["/entrypoint.sh"]

Dockerfile.arm

@@ -1,25 +1,20 @@
 FROM --platform=linux/arm64 node:alpine
 LABEL maintainer="sombochea@cubetiqs.com"
 
-RUN apk add --no-cache \
-    chromium \
-    nss \
-    freetype \
-    harfbuzz \
-    ca-certificates \
-    ttf-freefont
+RUN apk add --no-cache chromium nss freetype harfbuzz ca-certificates ttf-freefont
 
 ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
 ENV NODE_ENV production
 ENV ACCEPT_HIGHCHARTS_LICENSE="YES"
 
-RUN npm i -g highcharts-export-server@latest
+RUN npm i -g @cubetiq/highcharts-export-server@latest
 
 WORKDIR /usr/share/fonts/truetype
 ADD fonts/* ./
 RUN fc-cache -fv
 
 WORKDIR /
+ADD entrypoint.sh /entrypoint.sh
 
-EXPOSE 8080
-ENTRYPOINT ["highcharts-export-server", "--enableServer", "1", "--port", "8080"]
+EXPOSE ${PORT:-8080}
+ENTRYPOINT ["/entrypoint.sh"]

Makefile

@@ -11,4 +11,8 @@ build:
 	@echo 'Starting docker buildx push'
 	docker buildx build --platform linux/arm64,linux/arm/v7 -f Dockerfile.arm -t ${DOCKER_IMAGE_ARM} --push .
 
+run-test:
+	@echo 'Starting docker run'
+	docker run --rm -e PORT=5000 -e HIGHCHARTS_NO_LOGO=true -e HIGHCHARTS_UI_ENABLE=true -e HIGHCHARTS_UI_ROUTE=/ui --name hc-server -p 8080:5000 ${DOCKER_IMAGE}
+	
 .PHONY:build

entrypoint.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+PORT=${PORT:-8080}
+HIGHCHARTS_LOG_LEVEL=${HIGHCHARTS_LOG_LEVEL:-1}
+
+highcharts-export-server --enableServer 1 --port $PORT --logLevel $HIGHCHARTS_LOG_LEVEL