diff --git a/.circleci/config.yml b/.circleci/config.yml index 14aba90ebd..f7a10c88db 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: # basic units of work in a run build: # runs not using Workflows must have a `build` job as entry point docker: # run the steps with Docker # CircleCI Go images available at: https://hub.docker.com/r/circleci/golang/ - - image: cimg/go:1.20.6 # + - image: cimg/go:1.23.1 # # directory where steps are run. Path must conform to the Go Workspace requirements working_directory: ~/app diff --git a/lib/template/exec_test.go b/lib/template/exec_test.go index eebebb8c66..b86f10408d 100644 --- a/lib/template/exec_test.go +++ b/lib/template/exec_test.go @@ -980,7 +980,7 @@ func TestJSEscaping(t *testing.T) { {`'foo`, `\'foo`}, {`Go "jump" \`, `Go \"jump\" \\`}, {`Yukihiro says "今日は世界"`, `Yukihiro says \"今日は世界\"`}, - {"unprintable \uFDFF", `unprintable \uFDFF`}, + {"unprintable ﷿", `unprintable ﷿`}, {``, `\x3Chtml\x3E`}, } for _, tc := range testCases { diff --git a/yagpdb_docker/Dockerfile b/yagpdb_docker/Dockerfile index 2559426d36..9fa899a389 100644 --- a/yagpdb_docker/Dockerfile +++ b/yagpdb_docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.1 as builder +FROM golang:1.23.1 AS builder WORKDIR /appbuild/yagpdb COPY go.mod go.sum ./ diff --git a/yagpdb_docker/Dockerfile.debug b/yagpdb_docker/Dockerfile.debug index 9452538f04..2039abcede 100644 --- a/yagpdb_docker/Dockerfile.debug +++ b/yagpdb_docker/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.22.2-alpine +FROM golang:1.23.1-alpine # Dependencies: ca-certificates for client TLS, tzdata for timezone and ffmpeg for soundboard support RUN apk --no-cache add ca-certificates ffmpeg tzdata RUN CGO_ENABLED=0 go install -ldflags "-s -w -extldflags '-static'" github.com/go-delve/delve/cmd/dlv@latest diff --git a/yagpdb_docker/docker-compose.debug.yml b/yagpdb_docker/docker-compose.debug.yml index 088f95e0ea..da102f05a1 100644 --- a/yagpdb_docker/docker-compose.debug.yml +++ b/yagpdb_docker/docker-compose.debug.yml @@ -1,5 +1,3 @@ -version: '3' - volumes: db: redis: diff --git a/yagpdb_docker/docker-compose.dev.yml b/yagpdb_docker/docker-compose.dev.yml index 87d0485f59..6755444ad8 100644 --- a/yagpdb_docker/docker-compose.dev.yml +++ b/yagpdb_docker/docker-compose.dev.yml @@ -1,5 +1,3 @@ -version: '3' - volumes: db: redis: diff --git a/yagpdb_docker/docker-compose.proxied.yml b/yagpdb_docker/docker-compose.proxied.yml index 2918dabf31..5236d27a84 100644 --- a/yagpdb_docker/docker-compose.proxied.yml +++ b/yagpdb_docker/docker-compose.proxied.yml @@ -1,5 +1,3 @@ -version: '3' - volumes: db: redis: @@ -14,12 +12,10 @@ networks: services: app: - # We don't provide an official image, but there is a community-made image you can try: - # - teyker/yagpdb (https://hub.docker.com/r/teyker/yagpdb) - # - # Note that we do not take responsibility for anything that happens as a result of using - # the image above. - image: PUT_YOUR_OWN_IMAGE_HERE + #image: PUT_YOUR_OWN_IMAGE_HERE + build: + context: ../ + dockerfile: yagpdb_docker/Dockerfile restart: unless-stopped command: # - "/app/yagpdb" diff --git a/yagpdb_docker/docker-compose.proxy.yml b/yagpdb_docker/docker-compose.proxy.yml index 3d0d1a75f5..a174287941 100644 --- a/yagpdb_docker/docker-compose.proxy.yml +++ b/yagpdb_docker/docker-compose.proxy.yml @@ -1,5 +1,3 @@ -version: '3' - volumes: proxy_certs: proxy_config: diff --git a/yagpdb_docker/docker-compose.yml b/yagpdb_docker/docker-compose.yml index 8dd89e8e0c..cf4c4b819c 100644 --- a/yagpdb_docker/docker-compose.yml +++ b/yagpdb_docker/docker-compose.yml @@ -1,6 +1,4 @@ -version: '3' - -volumes: +#volumes: db: redis: cert_cache: @@ -15,8 +13,11 @@ services: # - teyker/yagpdb (https://hub.docker.com/r/teyker/yagpdb) # # Note that we do not take responsibility for anything that happens as a result of using - # the image above. - image: PUT_YOUR_OWN_IMAGE_HERE + # the image above. uncomment the below line in case your want to put your own image. + #image: PUT_YOUR_OWN_IMAGE_HERE + build: + context: ../ + dockerfile: yagpdb_docker/Dockerfile restart: unless-stopped command: # - "/app/yagpdb"