Compare commits

..

No commits in common. "8ef304956305d1dcb2501a2506ca85ac2f5da8a7" and "b6319fbc8afa2d2f824dfaa209f0c53511788e43" have entirely different histories.

4 changed files with 13 additions and 19 deletions

View File

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

View File

@ -1,20 +1,25 @@
FROM --platform=linux/arm64 node:alpine FROM --platform=linux/arm64 node:alpine
LABEL maintainer="sombochea@cubetiqs.com" 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 PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
ENV NODE_ENV production ENV NODE_ENV production
ENV ACCEPT_HIGHCHARTS_LICENSE="YES" ENV ACCEPT_HIGHCHARTS_LICENSE="YES"
RUN npm i -g @cubetiq/highcharts-export-server@latest RUN npm i -g highcharts-export-server@latest
WORKDIR /usr/share/fonts/truetype WORKDIR /usr/share/fonts/truetype
ADD fonts/* ./ ADD fonts/* ./
RUN fc-cache -fv RUN fc-cache -fv
WORKDIR / WORKDIR /
ADD entrypoint.sh /entrypoint.sh
EXPOSE ${PORT:-8080} EXPOSE 8080
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["highcharts-export-server", "--enableServer", "1", "--port", "8080"]

View File

@ -11,8 +11,4 @@ build:
@echo 'Starting docker buildx push' @echo 'Starting docker buildx push'
docker buildx build --platform linux/arm64,linux/arm/v7 -f Dockerfile.arm -t ${DOCKER_IMAGE_ARM} --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 .PHONY:build

View File

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