浏览代码

updating Dockerfile

main
Simon Bowie 3 周前
父节点
当前提交
1e23ac6a14
共有 4 个文件被更改,包括 10 次插入8 次删除
  1. +3
    -1
      .gitignore
  2. +2
    -2
      docker-compose.nginx.yml
  3. +2
    -2
      docker-compose.no-nginx.yml
  4. +3
    -3
      web/Dockerfile

+ 3
- 1
.gitignore 查看文件

web/app/__pycache__/ web/app/__pycache__/
.env.prod .env.prod
.env.dev .env.dev
.env
.DS_Store .DS_Store
database_functions_live.sh database_functions_live.sh
old_database_schema old_database_schema
db_exports db_exports
db_imports db_imports
node_modules
node_modules
docker-compose.yml

+ 2
- 2
docker-compose.nginx.yml 查看文件

services: services:
web: web:
build: ./web build: ./web
container_name: python
container_name: compendium
restart: unless-stopped restart: unless-stopped
expose: expose:
- 5000 - 5000


db: db:
image: mariadb:latest image: mariadb:latest
container_name: mariadb
container_name: compendium_mariadb
restart: unless-stopped restart: unless-stopped
env_file: env_file:
- ./.env.nginx - ./.env.nginx

+ 2
- 2
docker-compose.no-nginx.yml 查看文件

services: services:
web: web:
build: ./web build: ./web
container_name: python
container_name: compendium
restart: unless-stopped restart: unless-stopped
ports: ports:
- "5000:5000" - "5000:5000"
db: db:
image: mariadb:latest image: mariadb:latest
container_name: mariadb
container_name: compendium_mariadb
restart: unless-stopped restart: unless-stopped
env_file: env_file:
- ./.env - ./.env

+ 3
- 3
web/Dockerfile 查看文件

# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
FROM python:3.8-slim-buster
RUN apt update && apt install -y apt-transport-https ca-certificates sqlite3
FROM python:3.11-slim-bookworm
RUN apt-get update && apt-get install -y apt-transport-https ca-certificates sqlite3
WORKDIR /code WORKDIR /code
COPY requirements.txt requirements.txt COPY requirements.txt requirements.txt
RUN pip install -r requirements.txt RUN pip install -r requirements.txt
COPY . . COPY . .
CMD ["python3", "-m", "flask", "run"]
CMD ["python3", "-m", "flask", "run"]

正在加载...
取消
保存