From 8ca6c6f062ef67fcdadd0d0848667b321920415e Mon Sep 17 00:00:00 2001 From: jbergner Date: Tue, 22 Jul 2025 17:25:00 +0200 Subject: [PATCH] docker fixes 1 --- Dockerfile | 1 + compose.yml | 28 ++++++++++++++++++++++------ main.go | 2 +- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index f25ebb8..8f7b706 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,7 @@ FROM alpine:3.20 RUN apk add --no-cache ca-certificates COPY --from=builder /bin/sctradingtool /bin/sctradingtool +COPY ./static /bin/static # Default listens on :8080 – siehe main.go EXPOSE 8080 diff --git a/compose.yml b/compose.yml index 423db38..768e9dd 100644 --- a/compose.yml +++ b/compose.yml @@ -2,13 +2,28 @@ services: api: image: git.send.nrw/b1tsblog/trading:latest container_name: trading + volumes: + - /docker/trading-bitkiller:/data + labels: + - traefik.enable=true + - traefik.http.routers.trading.rule=Host(`trading.b1tsblog.org`) + - traefik.http.services.trading.loadbalancer.server.port=80 + - traefik.http.routers.trading.entrypoints=websecure + - traefik.http.routers.trading.tls=true + - traefik.http.routers.trading.tls.certresolver=letsencrypt + - traefik.http.middlewares.trading-redirect.redirectscheme.scheme=https + - traefik.http.middlewares.trading-redirect.redirectscheme.permanent=true + - traefik.http.routers.trading0.rule=Host(`trading.b1tsblog.org`) + - traefik.http.routers.trading0.entrypoints=web + - traefik.http.routers.trading0.middlewares=trading-redirect + - traefik.protocol=http networks: - - tradingnw + - traefik-net environment: # HIER BEARBEITEN - KT_USERNAME: Nutzername - KT_PASSWORD: Passwort - KT_MEMBER: InGame-Name + KT_USERNAME: groot + KT_PASSWORD: "" + KT_MEMBER: B1tK1ll3r # Sollten Ports extern verfügbar gemacht werden müssen (nicht empfohlen) #ports: #- "8080:8080" # : @@ -18,11 +33,12 @@ services: #image: fosrl/newt #container_name: newt #networks: - #- tradingnw + #- traefik-net #restart: unless-stopped #environment: #- PANGOLIN_ENDPOINT= #- NEWT_ID= #- NEWT_SECRET= networks: - tradingnw: \ No newline at end of file + traefik-net: + external: true \ No newline at end of file diff --git a/main.go b/main.go index 42b38b8..5f68031 100644 --- a/main.go +++ b/main.go @@ -82,7 +82,7 @@ func isAuthenticated(r *http.Request) bool { } func main() { - db, err := sql.Open("sqlite", "data.db") + db, err := sql.Open("sqlite", "/data/data.db") if err != nil { log.Fatal(err) }