improve docker compose setup, mount config so not required in build

Author: tdjsnelling

api/Dockerfile

@@ -1,7 +1,6 @@
 FROM node:16-alpine
-WORKDIR /app
-COPY config.js /config.js
-COPY api/ .
+WORKDIR /sqtracker/app
+COPY . .
 RUN yarn
 EXPOSE 44444
 CMD yarn start

api/src/controllers/user.js

@@ -7,7 +7,7 @@ import { getTorrentsPage } from './torrent'
 import { getUserRatio } from '../utils/ratio'
 import { mail } from '../index'
 
-const sendVerificationEmail = async (address, token) => {
+export const sendVerificationEmail = async (address, token) => {
   await mail.sendMail({
     from: `"${process.env.SQ_SITE_NAME}" <${process.env.SQ_MAIL_FROM_ADDRESS}>`,
     to: address,

api/src/middleware/announce.js

@@ -56,7 +56,7 @@ const handleAnnounce = async (req, res, next) => {
     ratio !== -1 &&
     Number(params.left > 0)
   ) {
-    res.statusMessage = 'Ratio is below minimum threshold'
+    res.statusMessage = `Ratio is below minimum threshold ${process.env.SQ_MINIMUM_RATIO}`
     res.sendStatus(403)
     return
   }

api/src/setup/createAdminUser.js

@@ -2,15 +2,18 @@ import bcrypt from 'bcrypt'
 import crypto from 'crypto'
 import jwt from 'jsonwebtoken'
 import User from '../schema/user'
+import { sendVerificationEmail } from '../controllers/user'
 
 const createAdminUser = async () => {
   const existingAdmin = await User.findOne({ username: 'admin' }).lean()
   if (!existingAdmin) {
     const created = Date.now()
+
     const hash = await bcrypt.hash('admin', 10)
+
     const adminUser = new User({
       username: 'admin',
-      email: 'admin@sqtracker',
+      email: process.env.SQ_ADMIN_EMAIL,
       role: 'admin',
       password: hash,
       created,
@@ -29,7 +32,21 @@ const createAdminUser = async () => {
       },
       process.env.SQ_JWT_SECRET
     )
+
     await adminUser.save()
+
+    const emailVerificationValidUntil = created + 48 * 60 * 60 * 1000
+    const emailVerificationToken = jwt.sign(
+      {
+        user: process.env.SQ_ADMIN_EMAIL,
+        validUntil: emailVerificationValidUntil,
+      },
+      process.env.SQ_JWT_SECRET
+    )
+    await sendVerificationEmail(
+      process.env.SQ_ADMIN_EMAIL,
+      emailVerificationToken
+    )
   }
 }
 

client/.dockerignore

@@ -1 +1,2 @@
-**/node_modules/
+**/node_modules/
+.next

client/Dockerfile

@@ -1,16 +1,15 @@
 FROM node:16-alpine AS builder
-WORKDIR /app
-COPY config.js /config.js
-COPY client/ .
+WORKDIR /sqtracker
+COPY . .
 RUN yarn install
+RUN echo "{}" > /config.js
 RUN ./node_modules/.bin/next build
 
 FROM node:16-alpine
-WORKDIR /app
-COPY --from=builder /config.js /config.js
-COPY --from=builder /app/node_modules ./node_modules
-COPY --from=builder /app/public ./public
-COPY --from=builder /app/.next ./.next
-COPY --from=builder /app/next.config.js ./next.config.js
+WORKDIR /sqtracker/client
+COPY --from=builder /sqtracker/node_modules ./node_modules
+COPY --from=builder /sqtracker/public ./public
+COPY --from=builder /sqtracker/.next ./.next
+COPY --from=builder /sqtracker/next.config.js ./next.config.js
 EXPOSE 44445
 CMD ["node_modules/.bin/next", "start", "-p", "44445"]

client/components/Notifications.js

@@ -125,6 +125,7 @@ export const NotificationsProvider = ({ children }) => {
         p="20px"
         pb="40px"
         overflowX="hidden"
+        zIndex={999}
         _css={{ '> * + *': { mt: 3 } }}
       >
         {notifications.map((notification, i) => (

docker-compose.yml docker-compose.dev.ymldocker-compose.yml renamed to docker-compose.dev.yml

@@ -28,8 +28,8 @@ services:
   api:
     container_name: sq_api
     build:
-      context: .
-      dockerfile: ./api/Dockerfile
+      context: ./api
+      dockerfile: Dockerfile
     ports:
       - "127.0.0.1:44444:44444"
     labels:
@@ -39,20 +39,24 @@ services:
       - "traefik.http.services.api.loadbalancer.server.port=44444"
       - "traefik.http.middlewares.api-prefix.stripprefix.prefixes=/api"
       - "traefik.http.routers.api.middlewares=api-prefix"
+    volumes:
+      - ./config.js:/sqtracker/config.js
     depends_on:
       - database
       - tracker
   client:
     container_name: sq_client
     build:
-      context: .
-      dockerfile: ./client/Dockerfile
+      context: ./client
+      dockerfile: Dockerfile
     ports:
       - "127.0.0.1:44445:44445"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.client.entrypoints=web"
       - "traefik.http.routers.client.rule=PathPrefix(`/`)"
       - "traefik.http.services.client.loadbalancer.server.port=44445"
+    volumes:
+      - ./config.js:/sqtracker/config.js
     depends_on:
-      - api
+      - api