From 6471bbc37c83e1130baaa56cc8f81da414663b4e Mon Sep 17 00:00:00 2001 From: Ryan Hodin <ryan951357@gmail.com> Date: Tue, 30 Jul 2024 19:17:04 -0500 Subject: [PATCH 1/3] Untrack docker-compose.yml Tracking this feels like a mistake - The example file exists, and overwrites the .yml when install gets run. That shouldn't make the repo have uncommitted changes, nor should checking out a new branch break your install, nor should what goes in compose upon install get put in PRs and such. --- .gitignore | 1 + docker-compose.yml | 94 ---------------------------------------------- 2 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 docker-compose.yml diff --git a/.gitignore b/.gitignore index c8406eed..3c482262 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ cadence.env icecast.xml liquidsoap.liq nginx.conf +docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index fb371657..00000000 --- a/docker-compose.yml +++ /dev/null @@ -1,94 +0,0 @@ -services: - - redis: - image: redis/redis-stack-server:latest - container_name: redis - expose: - - 6379 - networks: - internal_services: - - postgres: - image: postgres:15-alpine - container_name: postgres - expose: - - 5432 - env_file: - - ./config/cadence.env - networks: - internal_services: - - icecast2: - build: - dockerfile: ./src/icecast2.Dockerfile - image: kenellorando/cadence_icecast2:latest - container_name: icecast2 - restart: always - ports: - - 8000:8000 - volumes: - - ./config/icecast.xml:/etc/icecast/cadence.xml - networks: - external_services: - stream_delivery: - - liquidsoap: - build: - dockerfile: ./src/liquidsoap.Dockerfile - image: kenellorando/cadence_liquidsoap:latest - container_name: liquidsoap - restart: always - volumes: - - ./config/liquidsoap.liq:/etc/liquidsoap/cadence.liq - - /music/:/music/ - depends_on: - - icecast2 - expose: - - 1234 - networks: - internal_services: - stream_delivery: - - cadence: - build: - context: ./src/ - dockerfile: ./cadence.Dockerfile - image: kenellorando/cadence - container_name: cadence - restart: always - ports: - - 8080:8080 - env_file: - - ./config/cadence.env - volumes: - - /music/:/music/ - depends_on: - - icecast2 - - liquidsoap - - redis - - postgres - networks: - internal_services: - external_services: - - nginx: - profiles: ["nginx"] - image: nginx:latest - volumes: - - ./config/nginx.conf:/etc/nginx/nginx.conf - container_name: nginx - restart: on-failure - ports: - - 80:80 - depends_on: - - cadence - networks: - external_services: - -networks: - external_services: - driver: bridge - internal_services: - driver: bridge - stream_delivery: - driver: bridge From 9733442e57cad67f928d14f5bc83c45bc332388c Mon Sep 17 00:00:00 2001 From: Ryan Hodin <ryan951357@gmail.com> Date: Tue, 30 Jul 2024 19:18:54 -0500 Subject: [PATCH 2/3] Take Golang 1.22 --- src/cadence.Dockerfile | 6 +++--- src/server/go.mod | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cadence.Dockerfile b/src/cadence.Dockerfile index 3abf555f..228a11cd 100644 --- a/src/cadence.Dockerfile +++ b/src/cadence.Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.21-bullseye as builder +FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.22-bullseye as builder ARG TARGETPLATFORM BUILDPLATFORM TARGETOS TARGETARCH WORKDIR /cadence COPY ./* ./ @@ -7,7 +7,7 @@ RUN go mod download RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags="-w -s" -o /cadence-server ARG ARCH= -FROM ${ARCH}golang:1.21-alpine +FROM ${ARCH}golang:1.22-alpine LABEL maintainer="Ken Ellorando (kenellorando.com)" LABEL source="github.com/kenellorando/cadence" COPY --from=builder /cadence/public /cadence/server/public @@ -15,7 +15,7 @@ COPY --from=builder /cadence-server /cadence/cadence-server RUN adduser --disabled-password --gecos "" cadence RUN chown cadence /cadence/ /cadence/* /cadence/cadence-server -RUN chmod u+wrx /cadence/ /cadence/* +RUN chmod u+wrx /cadence/ /cadence/* EXPOSE 8080 USER cadence diff --git a/src/server/go.mod b/src/server/go.mod index b5741b39..708e0b5d 100644 --- a/src/server/go.mod +++ b/src/server/go.mod @@ -1,6 +1,6 @@ module github.com/kenellorando/cadence -go 1.21 +go 1.22 require ( github.com/Jeffail/gabs v1.4.0 From 5ed887d09a7165ad2196316b73b0257fc11eff6f Mon Sep 17 00:00:00 2001 From: Ryan Hodin <ryan951357@gmail.com> Date: Tue, 30 Jul 2024 19:19:10 -0500 Subject: [PATCH 3/3] Take Postgres 16 --- docker-compose.yml.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml.example b/docker-compose.yml.example index 83761c31..d7a220db 100644 --- a/docker-compose.yml.example +++ b/docker-compose.yml.example @@ -9,7 +9,7 @@ services: internal_services: postgres: - image: postgres:15-alpine + image: postgres:16-alpine container_name: postgres expose: - 5432