From 0abc76eb04e3fb3d0159e396dac6d1c9dff75e97 Mon Sep 17 00:00:00 2001 From: Farhan Khan Date: Fri, 14 Jul 2023 13:17:49 +0000 Subject: [PATCH] Adding some docker stuff I might delete later anyways --- docker-compose.yml | 36 ++++-------------------------------- fedilogue/Dockerfile | 11 +++++------ 2 files changed, 9 insertions(+), 38 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 80ce905..ed6f8c5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,9 +5,6 @@ services: build: fedilogue/ depends_on: - db - - vpn - cap_add: - - NET_ADMIN ports: - "127.0.0.1:5555:5555" restapi: @@ -16,37 +13,12 @@ services: - "127.0.0.1:6431:6432" depends_on: - db - frontend: - build: frontend/ - depends_on: - - restapi - - db - ports: - - "127.0.0.1:8080:8080" db: image: postgres:alpine restart: always environment: - POSTGRES_USER: fedilogue - POSTGRES_PASSWORD: fedilogue - POSTGRES_DB: fedilogue + POSTGRES_USER: $PGUSER + POSTGRES_PASSWORD: $PGPASS + POSTGRES_DB: $PGDATABASE volumes: - - ./postgres-data:/var/lib/postgresql - vpn: - image: bubuntux/nordvpn - cap_add: - - NET_ADMIN - - SYS_MODULE - sysctls: - - net.ipv4.conf.all.rp_filter=2 - devices: - - /dev/net/tun - environment: - - USER=${NORDVPNUSER} - - "PASS=${NORDVPNPASS}" - - CONNECT=United_States - - TECHNOLOGY=NordLynx - ulimits: - memlock: - soft: -1 - hard: -1 + - ./postgres-data:/var/lib/postgresql \ No newline at end of file diff --git a/fedilogue/Dockerfile b/fedilogue/Dockerfile index a4723a9..ba9283f 100644 --- a/fedilogue/Dockerfile +++ b/fedilogue/Dockerfile @@ -1,8 +1,7 @@ FROM golang:alpine -COPY . /app WORKDIR /app -RUN apk add postgresql-client -RUN go build . -ENV DATABASE_URL "postgres://fedilogue:fedilogue@db/fedilogue" -ENV PGPASSWORD "fedilogue" -ENTRYPOINT ["./entrypoint.sh"] +COPY fedilogue fedilogue +RUN ls -la ./ +RUN pwd +ENV DATABASE_URL "postgres://$PGUSER:$PGPASSWORD@db/$PGDATABASE" +CMD ["/app/fedilogue"] \ No newline at end of file