Bump some versions

Improve Dockerfile to reduce image size

.github/workflows/build.yaml

@@ -7,7 +7,7 @@ jobs:
   build:
     strategy:
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.21.x]
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:

.github/workflows/test.yaml

@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.21.x]
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:
@@ -14,7 +14,7 @@ jobs:
           go-version: ${{ matrix.go-version }}
       - name: Checkout code
         uses: actions/checkout@v3
-      - uses: actions/cache@v3.0.4
+      - uses: actions/cache@v3.0.10
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}

Dockerfile

@@ -1,5 +1,5 @@
 # This stage builds the go executable.
-FROM golang:1.18.3-buster as go
+FROM golang:1.21.0-alpine as go
 
 WORKDIR /root
 COPY ./ ./
@@ -10,14 +10,14 @@ RUN go build -o bin/app cmd/app/main.go
 # Final stage that will be pushed.
 FROM debian:buster-slim
 
-FROM node:18.5.0-buster-slim as node
+FROM node:18.10.0-buster-slim as node
 
 WORKDIR /root
 
 # copy the mermaidcli node package into the container and install
 COPY ./mermaidcli/* ./
 
-RUN npm install
+RUN npm install && npm cache clean --force;
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update 2>/dev/null && \
@@ -65,7 +65,7 @@ RUN apt-get update 2>/dev/null && \
         xdg-utils \
         wget \
         libxshmfence1 \
-		2>/dev/null
+		2>/dev/null && rm -rf /var/lib/apt/lists/*;
 
 COPY --from=go /root/bin/app ./app
 

Makefile

@@ -2,10 +2,10 @@ DOCKER_IMAGE=tomwright/mermaid-server:latest
 CONTAINER_NAME=mermaid-server
 
 docker-image:
-	docker build -t ${DOCKER_IMAGE} .
+	docker build --platform linux/x86_64 -t ${DOCKER_IMAGE} .
 
 docker-run:
-	docker run -d --name ${CONTAINER_NAME} -p 80:80 ${DOCKER_IMAGE}
+	docker run -d --platform linux/x86_64 --name ${CONTAINER_NAME} -p 80:80 ${DOCKER_IMAGE}
 
 docker-stop:
 	docker stop ${CONTAINER_NAME} || true

go.mod

@@ -1,6 +1,6 @@
 module github.com/tomwright/mermaid-server
 
-go 1.15
+go 1.21
 
 require (
 	github.com/tomwright/grace v0.1.2

mermaidcli/package.json

@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@mermaid-js/mermaid-cli": "^9.1.3"
+    "@mermaid-js/mermaid-cli": "^10.3.1"
   }
 }