Skip to content

Commit

Permalink
Don't track docker-compose.yml, and update dependencies that are easi…
Browse files Browse the repository at this point in the history
…ly updated (#266)

Those dependencies being "Not Liquidsoap" - Even though our liquidsoap
is absurdly far out of date, I really don't feel like bumping the major
version, especially not when I'm not knowledgeable in that domain.

Therefore, see #265.
  • Loading branch information
kenellorando committed Aug 1, 2024
2 parents eca4f37 + 5ed887d commit a287dcf
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 99 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ cadence.env
icecast.xml
liquidsoap.liq
nginx.conf
docker-compose.yml
94 changes: 0 additions & 94 deletions docker-compose.yml

This file was deleted.

2 changes: 1 addition & 1 deletion docker-compose.yml.example
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
internal_services:

postgres:
image: postgres:15-alpine
image: postgres:16-alpine
container_name: postgres
expose:
- 5432
Expand Down
6 changes: 3 additions & 3 deletions src/cadence.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# 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 ./* ./
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
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
Expand Down
2 changes: 1 addition & 1 deletion src/server/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/kenellorando/cadence

go 1.21
go 1.22

require (
github.com/Jeffail/gabs v1.4.0
Expand Down

0 comments on commit a287dcf

Please sign in to comment.