Skip to content

Commit

Permalink
Merge pull request FujiwaraChoki#132 from RicardoMonteiroSimoes/main
Browse files Browse the repository at this point in the history
  • Loading branch information
FujiwaraChoki authored Feb 10, 2024
2 parents 1a33e6e + 380bcc3 commit a75bb9f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 15 deletions.
17 changes: 5 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
FROM ubuntu:22.04
FROM python:3.11-slim-buster

RUN apt-get update && apt-get install --no-install-recommends -y python3.11 \
python3-dev python3-pip build-essential \
autoconf pkg-config wget ghostscript
RUN apt-get update && apt-get install --no-install-recommends -y \
build-essential autoconf pkg-config wget ghostscript curl libpng-dev

RUN apt-get update && apt-get install -y wget && \
apt-get install -y build-essential curl libpng-dev && \
wget https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.0-31.tar.gz && \
RUN wget https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.0-31.tar.gz && \
tar xzf 7.1.0-31.tar.gz && \
rm 7.1.0-31.tar.gz && \
apt-get clean && \
Expand All @@ -17,14 +14,10 @@ RUN sh ./ImageMagick-7.1.0-31/configure --prefix=/usr/local --with-bzlib=yes --w

WORKDIR /tmp


RUN pip install --upgrade pip

WORKDIR /app

ADD ./requirements.txt .
RUN pip install -r requirements.txt

ADD ./Backend ./backend
ADD ./Frontend ./frontend
ADD ./fonts ./fonts
RUN pip install -r requirements.txt
11 changes: 8 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ services:
ports:
- "8001:8001"
command: ["python3", "-m", "http.server", "8001", "--directory", "frontend"]
volumes:
- ./Frontend:/app/frontend
restart: always
backend:
build:
Expand All @@ -19,11 +21,14 @@ services:
command: ["python3", "backend/main.py"]
volumes:
- ./files:/temp
- ./Backend:/app/backend
- ./fonts:/app/fonts
environment:
- ASSEMBLY_AI_API_KEY=
- TIKTOK_SESSION_ID=
- ASSEMBLY_AI_API_KEY=${ASSEMBLY_AI_API_KEY}
- TIKTOK_SESSION_ID=${TIKTOK_SESSION_ID}
- IMAGEMAGICK_BINARY=/usr/local/bin/magick
- PEXELS_API_KEY=
- PEXELS_API_KEY=${PEXELS_API_KEY}
- OPENAI_API_KEY=${OPENAI_API_KEY}
depends_on:
- frontend
restart: always
Expand Down

0 comments on commit a75bb9f

Please sign in to comment.