changed docker-compose files to use the dockerfile instead of pushing… (

#1729) * changed docker-compose files to use the dockerfile instead of pushing user to put an image, first time self-hosters shouldn't be made to jump through hoops * bumped golang version in circleci conf * fix borked test case after go version bump --------- Co-authored-by: Ashish <[email protected]>
botlabs-gg · Sep 24, 2024 · bd8f9d2 · bd8f9d2
1 parent e1695f0
commit bd8f9d2
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 23 deletions.
diff --git 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
@@ -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 ﷿`},
 		{`<html>`, `\x3Chtml\x3E`},
 	}
 	for _, tc := range testCases {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"