Merge pull request #64 from SocialGouv/feat/mailer-to-nodemailer

feat/mailer to nodemailer

README.md

@@ -16,6 +16,14 @@ Pour démarrer la suite ELK localement :
 docker compose up -d
 ```
 
+Au premier run ELK, lancez cette suite de commande
+
+```
+cd webapp-next
+mkdir -p certs/ca
+docker cp elasticsearch:/usr/share/elasticsearch/config/certs/ca/ca.crt ./certs/ca/ca.crt
+```
+
 Pour initialiser les variables d'environnement NextJS
 
 ```

docker-compose.yaml

@@ -38,29 +38,29 @@ services:
     environment:
       - ELASTICSEARCH_PASSWORD=${KIBANA_PASSWORD}
 
-  webapp:
-    build:
-      context: webapp-next
-      args:
-        - NEXT_PUBLIC_ELASTIC_API_KEY_NAME=${NEXT_PUBLIC_ELASTIC_API_KEY_NAME}
-    container_name: webapp
-    depends_on:
-      - elasticsearch
-    ports:
-      - '3000:3000'
-    volumes:
-      - certs:/app/certs
-    networks:
-      - webapp
-    environment:
-      - ELASTIC_HOST=${ELASTIC_HOST}
-      - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
-      - NODEMAILER_HOST=${NODEMAILER_HOST}
-      - NODEMAILER_PORT=${NODEMAILER_PORT}
-      - NODEMAILER_USER=${NODEMAILER_USER}
-      - NODEMAILER_PASSWORD=${NODEMAILER_PASSWORD}
-      - NODEMAILER_FROM=${NODEMAILER_FROM}
-      - NODEMAILER_BASEURL=${NODEMAILER_BASEURL}
+  # webapp:
+  #   build:
+  #     context: webapp-next
+  #     args:
+  #       - NEXT_PUBLIC_ELASTIC_API_KEY_NAME=${NEXT_PUBLIC_ELASTIC_API_KEY_NAME}
+  #   container_name: webapp
+  #   depends_on:
+  #     - elasticsearch
+  #   ports:
+  #     - '3000:3000'
+  #   volumes:
+  #     - certs:/app/certs
+  #   networks:
+  #     - webapp
+  #   environment:
+  #     - ELASTIC_HOST=${ELASTIC_HOST}
+  #     - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
+  #     - NODEMAILER_HOST=${NODEMAILER_HOST}
+  #     - NODEMAILER_PORT=${NODEMAILER_PORT}
+  #     - NODEMAILER_USER=${NODEMAILER_USER}
+  #     - NODEMAILER_NODEMAILER_PASSWORDPORT=${NODEMAILER_PASSWORD}
+  #     - NODEMAILER_FROM=${NODEMAILER_FROM}
+  #     - NODEMAILER_BASEURL=${NODEMAILER_BASEURL}
 
 volumes:
   certs:

webapp-next/Dockerfile

@@ -45,18 +45,18 @@ WORKDIR /app
 
 ENV NODE_ENV production
 
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
+RUN addgroup --system --gid 1001 nodejs && \
+    adduser --system --uid 1001 nextjs
 
-COPY --from=builder /app/next.config.js ./
 COPY --from=builder /app/public ./public
-COPY --from=builder /app/package.json ./package.json
+COPY --from=builder /app/.next ./.next
+COPY --from=builder /app/node_modules ./node_modules
 
-COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
-COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+RUN chmod 1777 /tmp
+RUN chmod 1777 /app
+
+USER 1001
 
-USER nextjs
 EXPOSE 3000
 ENV PORT 3000
-
-CMD ["node", "server.js"]
+CMD ["yarn", "start"]

webapp-next/components/login/FormLogin.tsx

@@ -147,6 +147,7 @@ export const FormLogin = () => {
         startTimer();
         setShowCodeForm(true);
       } catch (e) {
+        console.log(e);
         setFormError(true);
       }