Bump some versions

TomWright · Aug 29, 2023 · f298157 · f298157
1 parent c4e03f7
commit f298157
Show file tree

Hide file tree

Showing 7 changed files with 734 additions and 173 deletions.
diff --git a/.github/workflows/build.yaml b/.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:

diff --git a/.github/workflows/test.yaml b/.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:

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # This stage builds the go executable.
-FROM golang:1.19.3-buster as go
+FROM golang:1.21.0-alpine as go
 
 WORKDIR /root
 COPY ./ ./

diff --git a/Makefile b/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

diff --git a/go.mod b/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