Skip to content

Docker config improvements #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
radiophysicist wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

Docker config improvements #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c37255b
Add redis into docker-compose config
radiophysicist Sep 9, 2021
6a95402
Add mysql into docker-compose config
radiophysicist Sep 9, 2021
f6ef40d
Enable source mounting in Dockerfile
radiophysicist Sep 9, 2021
feecd3f
Switch network mode in compose config
radiophysicist Sep 9, 2021
867ce24
Add translation files compiling on admin app startup
radiophysicist Sep 9, 2021
d8f07fe
Update README
radiophysicist Sep 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
DATABASE_URL=mysql://admin:admin@db:3306/fastapi-admin
REDIS_URL=redis://redis:6379/0
Copy link

@janas-adam janas-adam Aug 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imo this file is not needed (look its ignored in gitignore)

i would create .sample.env file with given default values 🤔

10 changes: 4 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
FROM jfloff/alpine-python
ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
RUN mkdir -p /fastapi-admin
WORKDIR /fastapi-admin
COPY pyproject.toml poetry.lock /fastapi-admin/
RUN pip3 install poetry
ENV POETRY_VIRTUALENVS_CREATE false
WORKDIR /tmp
ADD pyproject.toml .
ADD poetry.lock .
Copy link

@janas-adam janas-adam Aug 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

simple oneline copy is sufficient (adds not needed)

COPY pyproject.toml poetry.lock ./

RUN poetry install --no-root
Copy link

@janas-adam janas-adam Aug 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can remove ENV POETRY_VIRTUALENVS_CREATE false
and simply do:

...
RUN poetry config virtualenvs.create false
RUN poetry install --no-root

also we can add ENV PYTHONUNBUFFERED 1

COPY . /fastapi-admin
RUN poetry install
RUN make compile
WORKDIR /fastapi-admin
11 changes: 2 additions & 9 deletions README-zh.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,8 @@
## 本地运行示例

1. 克隆仓库。
2. 创建 `.env` 文件。

```dotenv
DATABASE_URL=mysql://root:123456@127.0.0.1:3306/fastapi-admin
REDIS_URL=redis://localhost:6379/0
```

3. 运行 `docker-compose up -d --build`。
4. 访问 <http://localhost:8000/admin/init> 创建第一个管理员。
2. 运行 `docker-compose up -d --build`。
3. 访问 <http://localhost:8000/admin/init> 创建第一个管理员。

## 文档

Expand Down
11 changes: 2 additions & 9 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,8 @@ Or pro version online demo [here](https://fastapi-admin-pro.long2ice.io/admin/lo
## Run examples in local

1. Clone repo.
2. Create `.env` file.
Copy link

@janas-adam janas-adam Aug 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

then in readme we just inform

2. Copy sample env file and set your own environment variables
cp .sample.env .env


```dotenv
DATABASE_URL=mysql://root:123456@127.0.0.1:3306/fastapi-admin
REDIS_URL=redis://localhost:6379/0
```

3. Run `docker-compose up -d --build`.
4. Visit <http://localhost:8000/admin/init> to create first admin.
2. Run `docker-compose up -d --build`.
3. Visit <http://localhost:8000/admin/init> to create first admin.

## Documentation

Expand Down
30 changes: 28 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,32 @@ services:
build: .
restart: always
env_file: .env
network_mode: host
image: fastapi-admin
command: uvicorn examples.main:app_ --port 8000 --host 0.0.0.0
command: bash -c "pybabel compile -d fastapi_admin/locales && uvicorn examples.main:app_ --port 8000 --host 0.0.0.0 --reload"
depends_on:
- db
- redis
volumes:
- .:/fastapi-admin
ports:
- 8000:8000

db:
Copy link

@janas-adam janas-adam Aug 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in db instead of environment section:

  env_file: ./.env

suggestion:
i am wondering about creating additional docker-compose.dev.yaml file with db/redis service configuration 🤔

image: mysql:5.7
volumes:
- db_data:/var/lib/mysql
restart: always
environment:
MYSQL_ROOT_PASSWORD: 123456
MYSQL_DATABASE: fastapi-admin
MYSQL_USER: admin
MYSQL_PASSWORD: admin

redis:
image: 'redis:6.2.5-alpine'
volumes:
- redis_data:/data

volumes:
db_data:
redis_data: