README.md

@@ -1,5 +1,3 @@
 # LaTeX-Brief-Webseite
 
-[![Build Status](https://ci.sp-codes.de/api/badges/cami/Brief-Generator/status.svg)](https://ci.sp-codes.de/cami/Brief-Generator)
-
 This is a small website to easily set a letter in LaTeX

backend/.dockerignore

@@ -1 +0,0 @@
-venv

backend/Dockerfile

@@ -1,19 +1,11 @@
-FROM python:slim as base
+FROM python
 
-FROM base as builder
-
-RUN mkdir /install
-WORKDIR /install
-
-COPY requirements.txt /requirements.txt
-
-RUN pip install --prefix=/install -r /requirements.txt
-
-FROM base
-
-COPY --from=builder /install /usr/local
-
-COPY /src /app
 WORKDIR /app
 
+COPY requirements.txt .
+
+RUN pip install -r requirements.txt
+
+COPY /src .
+
 CMD [ "flask", "run" ]

backend/Dockerfile.prod

@@ -1,19 +1,15 @@
-FROM python:slim as base
+FROM python
+
+WORKDIR /app
 
 RUN apt-get -y update && apt-get -y upgrade
 
-FROM base as builder
-RUN mkdir /install
-WORKDIR /install
+COPY requirements.txt .
 
-COPY requirements.txt /requirements.txt
-RUN pip install --prefix=/install -r /requirements.txt
+RUN apt-get -y install sqlite3
 
-FROM base
+RUN pip install -r requirements.txt
 
-COPY --from=builder /install /usr/local
+COPY /src .
 
-COPY /src /app
-WORKDIR /app
-
-CMD [ "flask", "run" ]
+CMD [ "python", "app.py" ]

docker-compose.prod.yml

@@ -1,21 +0,0 @@
-version: '3.7'
-
-services:
-  frontend-prod:
-    container_name: frontend-lettergen
-    build:
-      context: ./frontend
-      dockerfile: Dockerfile.prod
-    ports:
-      - 127.0.0.1:3000:80
-  backend-prod:
-    container_name: backend-lettergen
-    build:
-      context: ./backend
-      dockerfile: Dockerfile.prod
-    ports:
-      - 127.0.0.1:5000:5000
-    environment:
-      DEBUG: "no"
-      PORT: 5050
-      HOST: "0.0.0.0"

frontend/.dockerignore

@@ -1,12 +1,8 @@
-**/node_modules/
+node_modules
+npm-debug.log
+build
+.dockerignore
 **/.git
-**/README.md
-**/LICENSE
-**/.vscode
-**/npm-debug.log
-**/coverage
-**/.env
-**/.editorconfig
-**/.aws
-**/dist
-
+**/.DS_Store
+**/node_modules
+.env

frontend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:slim AS build
+FROM node:latest
 
 # set working directory
 WORKDIR /app
@@ -10,9 +10,7 @@ ENV PATH /app/node_modules/.bin:$PATH
 COPY package.json ./
 COPY package-lock.json ./
 
-RUN npm install && npm cache clean --force
-
-EXPOSE 3000
+RUN npm install
 
 # add app
 COPY . ./

frontend/Dockerfile.prod

@@ -1,18 +1,13 @@
-FROM node:slim as build
-
+FROM node:latest as build
 WORKDIR /app
-
 ENV PATH /app/node_modules/.bin:$PATH
-
 COPY package.json ./
 COPY package-lock.json ./
-
-RUN npm ci --production && npm cache clean --force
+RUN npm ci --silent
 COPY . ./
 RUN npm run build
 
-FROM nginx:alpine
-RUN apk -U upgrade
+FROM nginx:latest
 COPY --from=build /app/build /usr/share/nginx/html
 RUN rm /etc/nginx/conf.d/default.conf
 COPY nginx/nginx.conf /etc/nginx/conf.d

start.sh

@@ -4,4 +4,6 @@ podman stop frontend-dev
 podman stop backend-dev 
 podman rm frontend-dev 
 podman rm backend-dev 
+podman rmi localhost/latex-brief-webseite_backend-dev
+podman rmi localhost/latex-brief-webseite_frontend-dev
 podman-compose up --build