kenellorando · kenellorando · Sep 15, 2023 · Sep 15, 2023 · Nov 2, 2023
diff --git a/Makefile b/Makefile
@@ -1,13 +1,16 @@
 build-init:
 	docker buildx create --platform linux/arm/v7,linux/amd64 --use --name multiarch
 
-build-cadence:
-	docker buildx build --push --platform linux/arm/v7,linux/amd64 --tag kenellorando/cadence:latest --tag kenellorando/cadence:$(VERSION) --file ./cadence/cadence.Dockerfile ./cadence/
+build-cadence_api:
+	docker buildx build --push --platform linux/arm/v7,linux/amd64 --tag "kenellorando/cadence_api:latest" --tag kenellorando/cadence_api:$(VERSION) --file ./src/cadence-api.Dockerfile ./src/
+
+# build-cadence_api:
+# 	docker buildx build --push --platform linux/arm/v7,linux/amd64 --tag "kenellorando/cadence:latest" --tag kenellorando/cadence:$(VERSION) --file ./src/cadence.Dockerfile ./src/
 
 build-cadence_icecast2:
-	docker buildx build --push --platform linux/arm/v7,linux/amd64 --tag kenellorando/cadence_icecast2:latest --tag kenellorando/cadence_icecast2:$(VERSION) --file ./cadence/icecast2.Dockerfile ./cadence/
+	docker buildx build --push --platform linux/arm/v7,linux/amd64 --tag kenellorando/cadence_icecast2:latest --tag kenellorando/cadence_icecast2:$(VERSION) --file ./src/icecast2.Dockerfile ./src/
 
 build-cadence_liquidsoap:
-	docker buildx build --push --platform linux/arm/v7,linux/amd64 --tag kenellorando/cadence_liquidsoap:latest --tag kenellorando/cadence_liquidsoap:$(VERSION) --file ./cadence/liquidsoap.Dockerfile ./cadence/
+	docker buildx build --push --platform linux/arm/v7,linux/amd64 --tag kenellorando/cadence_liquidsoap:latest --tag kenellorando/cadence_liquidsoap:$(VERSION) --file ./src/liquidsoap.Dockerfile ./src/
 
-build-all: build-cadence build-cadence_icecast2 build-cadence_liquidsoap
+build-all: build-cadence_api build-cadence_icecast2 build-cadence_liquidsoap
diff --git a/config/cadence.env.example b/config/cadence.env.example
@@ -9,7 +9,7 @@ POSTGRES_PASSWORD=CADENCE_PASS_EXAMPLE
 # Development
 CSERVER_DEVMODE=0
 CSERVER_VERSION=5.4.3
-CSERVER_ROOTPATH=/cadence/server/
+CSERVER_ROOTPATH=/cadence/api/
 
 # Service Addresses
 CSERVER_PORT=:8080

diff --git a/config/nginx.conf.example b/config/nginx.conf.example
@@ -27,10 +27,10 @@ http {
 			chunked_transfer_encoding off;
 			proxy_buffering off;
 			proxy_cache off;
-			proxy_pass http://cadence:8080/api/radiodata/sse;
+			proxy_pass http://cadence-api:8080/api/radiodata/sse;
 		}
 		location / {
-			proxy_pass http://cadence:8080/;
+			proxy_pass http://cadence-api:8080/;
 		}
 	}
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   icecast2:
     build:
-      dockerfile: ./cadence/icecast2.Dockerfile
+      dockerfile: ./src/icecast2.Dockerfile
     image: kenellorando/cadence_icecast2:latest
     container_name: icecast2
     restart: always
@@ -35,7 +35,7 @@ services:
 
   liquidsoap:
     build:
-      dockerfile: ./cadence/liquidsoap.Dockerfile
+      dockerfile: ./src/liquidsoap.Dockerfile
     image: kenellorando/cadence_liquidsoap:latest
     container_name: liquidsoap
     restart: always
@@ -50,12 +50,12 @@ services:
       internal_services:
       stream_delivery:
 
-  cadence:
+  cadence-api:
     build:
-      context: ./cadence
-      dockerfile: ./cadence.Dockerfile
-    image: kenellorando/cadence
-    container_name: cadence
+      context: ./src
+      dockerfile: ./cadence-api.Dockerfile
+    image: kenellorando/cadence-api
+    container_name: cadence-api
     restart: always
     ports:
       - 8080:8080
@@ -81,7 +81,7 @@ services:
     ports:
       - 80:80
     depends_on:
-      - cadence
+      - cadence-api
     networks:
       external_services:
 

diff --git a/docker-compose.yml.example b/docker-compose.yml.example
@@ -21,7 +21,7 @@ services:
 
   icecast2:
     build:
-      dockerfile: ./cadence/icecast2.Dockerfile
+      dockerfile: ./src/icecast2.Dockerfile
     image: kenellorando/cadence_icecast2:latest
     container_name: icecast2
     restart: always
@@ -35,7 +35,7 @@ services:
 
   liquidsoap:
     build:
-      dockerfile: ./cadence/liquidsoap.Dockerfile
+      dockerfile: ./src/liquidsoap.Dockerfile
     image: kenellorando/cadence_liquidsoap:latest
     container_name: liquidsoap
     restart: always
@@ -50,19 +50,19 @@ services:
       internal_services:
       stream_delivery:
 
-  cadence:
+  cadence-api:
     build:
-      context: ./cadence
-      dockerfile: ./cadence.Dockerfile
-    image: kenellorando/cadence
-    container_name: cadence
+      context: ./src
+      dockerfile: ./cadence-api.Dockerfile
+    image: kenellorando/cadence-api
+    container_name: cadence-api
     restart: always
     ports:
       - 8080:8080
     env_file:
       - ./config/cadence.env
     volumes:
-      - CADENCE_PATH_EXAMPLE:CADENCE_PATH_EXAMPLE
+      - /music:/music
     depends_on:
       - icecast2
       - liquidsoap
@@ -81,7 +81,7 @@ services:
     ports:
       - 80:80
     depends_on:
-      - cadence
+      - cadence-api
     networks:
       external_services:
 

diff --git a/cadence/server/api.go → src/api/api.go b/cadence/server/api.go → src/api/api.go
diff --git a/cadence/server/api_actions.go → src/api/api_actions.go b/cadence/server/api_actions.go → src/api/api_actions.go
diff --git a/cadence/server/db_postgres.go → src/api/db_postgres.go b/cadence/server/db_postgres.go → src/api/db_postgres.go
diff --git a/cadence/server/db_redis.go → src/api/db_redis.go b/cadence/server/db_redis.go → src/api/db_redis.go
diff --git a/cadence/server/go.mod → src/api/go.mod b/cadence/server/go.mod → src/api/go.mod
diff --git a/cadence/server/go.sum → src/api/go.sum b/cadence/server/go.sum → src/api/go.sum
diff --git a/cadence/server/main.go → src/api/main.go b/cadence/server/main.go → src/api/main.go
diff --git a/cadence/server/public/css/main.css → src/api/public/css/main.css b/cadence/server/public/css/main.css → src/api/public/css/main.css
diff --git a/cadence/server/public/index.html → src/api/public/index.html b/cadence/server/public/index.html → src/api/public/index.html
diff --git a/cadence/server/public/js/aria.js → src/api/public/js/aria.js b/cadence/server/public/js/aria.js → src/api/public/js/aria.js
diff --git a/cadence/server/public/js/page.js → src/api/public/js/page.js b/cadence/server/public/js/page.js → src/api/public/js/page.js
diff --git a/cadence/server/public/static/blank.jpg → src/api/public/static/blank.jpg b/cadence/server/public/static/blank.jpg → src/api/public/static/blank.jpg
diff --git a/cadence/server/public/static/favicon.ico → src/api/public/static/favicon.ico b/cadence/server/public/static/favicon.ico → src/api/public/static/favicon.ico
diff --git a/cadence/server/public/static/splash.jpg → src/api/public/static/splash.jpg b/cadence/server/public/static/splash.jpg → src/api/public/static/splash.jpg
diff --git a/cadence/server/routes.go → src/api/routes.go b/cadence/server/routes.go → src/api/routes.go
diff --git a/cadence/cadence.Dockerfile → src/cadence-api.Dockerfile b/cadence/cadence.Dockerfile → src/cadence-api.Dockerfile
@@ -4,19 +4,19 @@ ARG TARGETPLATFORM BUILDPLATFORM TARGETOS TARGETARCH
 WORKDIR /cadence
 COPY ./* ./
 RUN go mod download
-RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags="-w -s" -o /cadence-server
+RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags="-w -s" -o /cadence-api
 
 ARG ARCH=
 FROM ${ARCH}golang:1.21-alpine
 LABEL maintainer="Ken Ellorando (kenellorando.com)"
 LABEL source="github.com/kenellorando/cadence"
-COPY --from=builder /cadence/public /cadence/server/public
-COPY --from=builder /cadence-server /cadence/cadence-server
+COPY --from=builder /cadence/public /cadence/api/public
+COPY --from=builder /cadence-api /cadence/cadence-api
 
 RUN adduser --disabled-password --gecos "" cadence
-RUN chown cadence /cadence/ /cadence/* /cadence/cadence-server
+RUN chown cadence /cadence/ /cadence/* /cadence/cadence-api
 RUN chmod u+wrx /cadence/ /cadence/* 
 
 EXPOSE 8080
 USER cadence
-CMD [ "/cadence/cadence-server" ]
+CMD [ "/cadence/cadence-api" ]
diff --git a/cadence/icecast2.Dockerfile → src/icecast2.Dockerfile b/cadence/icecast2.Dockerfile → src/icecast2.Dockerfile
diff --git a/cadence/liquidsoap.Dockerfile → src/liquidsoap.Dockerfile b/cadence/liquidsoap.Dockerfile → src/liquidsoap.Dockerfile
@@ -12,7 +12,7 @@ RUN ln -s /usr/bin/dpkg-split /usr/sbin/dpkg-split && \
 RUN apt clean all
 RUN apt update
 RUN apt install liquidsoap=1.4.3-3 -y
-RUN apt autoremove
+RUN apt autoremove --purge
 EXPOSE 1234
 USER liquidsoap
 CMD [ "liquidsoap", "-t", "/etc/liquidsoap/cadence.liq" ]