diff --git a/README.md b/README.md new file mode 100644 index 0000000..86cdd01 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +blah + +docker buildx build -f f0ck.dockerfile . -t f0ck-dockerv + diff --git a/config_example.json b/config_example.json index 5caef68..a0bc69a 100644 --- a/config_example.json +++ b/config_example.json @@ -1,9 +1,9 @@ { "main": { "url": { - "full": "", - "domain": "", - "regex": "blah\\.tld" + "full": "http://f0ck.lokal", + "domain": "f0ck.lokal", + "regex": "f0ck\\.lokal" }, "socks": "", "maxfilesize": 83886080, @@ -15,7 +15,7 @@ "allowedMimes": [ "audio", "image", "video" ], "nsfp": [ ], "websrv": { - "port": "1338", + "port": "1337", "paths": { "images": "/b", "thumbnails": "/t", @@ -31,30 +31,31 @@ }, "clients": [{ "type": "tg", - "enabled": true, + "enabled": false, "token": "", "pollrate": 1001 }, { "type": "irc", - "enabled": false, - "network": "", + "enabled": true, + "network": "irc.n0xy.net", "host": "", "port": 6697, "ssl": true, "selfSigned": false, "sasl": false, - "nickname": "", - "username": "", + "nickname": "fleischwurst", + "username": "fleischwurst", "password": "", - "realname": "", + "realname": "fleischwurst", "channels": [ + "#fleischwurst" ] }], "sql": { "host": "localhost", - "user": "", - "password": "", - "database": "", + "user": "f0ck", + "password": "f0ck", + "database": "f0ck", "multipleStatements": true }, "admins": [{ diff --git a/docker-compose.yaml b/docker-compose.yaml index 1e58e32..6d201ea 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,46 +3,30 @@ version: '3.5' services: f0ck: container_name: f0ck-dockerv - image: f0ck-dockerv4 + image: f0ck-dockerv15 networks: - f0cked volumes: - - f0ck-data-b:/opt/f0ckv2/public/f0ck-b - - f0ck-data-ca:/opt/f0ckv2/public/f0ck-ca - - f0ck-data-t:/opt/f0ckv2/public/f0ck-t + - ./config.json:/opt/f0ckv2/config.json + - ./f0ckv2.sql:/opt/f0ckv2/f0ckv2.sql ports: - - "1338:1338" + - "1337:1337" restart: on-failure postgres: - container_name: f0ck_postgres + container_name: postgres image: postgres environment: - POSTGRES_DB: f0ckv2 + POSTGRES_DB: f0ck POSTGRES_USER: f0ck POSTGRES_PASSWORD: f0ck PGDATA: /data/postgres volumes: - - postgres:/data/postgres + - ./postgres:/data/postgres ports: - "5432:5432" networks: - f0cked restart: unless-stopped - - # pgadmin: - # container_name: pgadmin_container - # image: dpage/pgadmin4 - # environment: - # PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD:-admin} - # PGADMIN_CONFIG_SERVER_MODE: 'False' - # volumes: - # - pgadmin:/var/lib/pgadmin - - # ports: - # - "5050:80" - # networks: - # - f0cked - # restart: unless-stopped networks: f0cked: @@ -50,6 +34,3 @@ networks: volumes: postgres: - f0ck-data-b: - f0ck-data-ca: - f0ck-data-t: diff --git a/f0ck.dockerfile b/f0ck.dockerfile index 65165ef..feb9680 100644 --- a/f0ck.dockerfile +++ b/f0ck.dockerfile @@ -2,10 +2,13 @@ FROM archlinux RUN pacman -Syy --noconfirm RUN pacman -S nodejs npm ffmpeg yt-dlp ffmpegthumbnailer postgresql imagemagick git mailcap --noconfirm +WORKDIR /opt/ +RUN git clone https://git.lat/f0ck/f0ckv2.git + WORKDIR /opt/f0ckv2 -VOLUME ./f0ckv2 /opt/f0ckv2 -ENTRYPOINT ["npm", "run", "start"] -COPY f0ckv2/ /opt/f0ckv2 + RUN npm i RUN mkdir -p public/ca deleted/{ca,b,t} -COPY config.json /opt/f0ckv2/ \ No newline at end of file + + +ENTRYPOINT ["npm", "run", "start"] \ No newline at end of file