Skip to content
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.

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

update docker settings. #150

Merged
merged 1 commit into from
Sep 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ services:
- studio/config/.env
volumes:
- db_data:/var/lib/mysql
environment:
TZ: Asia/Tokyo

phpmyadmin:
image: phpmyadmin
Expand All @@ -18,6 +20,8 @@ services:
- studio/config/.env
ports:
- 20080:80
environment:
TZ: Asia/Tokyo

studio-dev-be:
build:
Expand All @@ -43,6 +47,8 @@ services:
ports:
- "3000:3000"
command: ash -c 'yarn install && yarn start'
environment:
TZ: Asia/Tokyo

volumes:
db_data:
9 changes: 9 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,29 @@ services:
- studio/config/.env
volumes:
- db_data:/var/lib/mysql
environment:
TZ: Asia/Tokyo
restart: always

studio:
build:
context: .
dockerfile: studio/config/docker/Dockerfile
working_dir: /app
volumes:
- ../optinist-docker-volumes/.snakemake/:/app/.snakemake
- ../optinist-docker-volumes/logs/:/app/logs
- ../optinist-docker-volumes/studio_data/:/app/studio_data
ports:
- "8000:8000"
command: bash -c "alembic upgrade head && python main.py --host 0.0.0.0 --port 8000"
environment:
PYTHONPATH: /app/
TZ: Asia/Tokyo
OPTINIST_DIR: /app/studio_data
depends_on:
- db
restart: always

volumes:
db_data:
3 changes: 3 additions & 0 deletions studio/config/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ FROM --platform=linux/amd64 python:3.8.16-slim

WORKDIR /app

RUN echo 'alias ll="ls -la"' >> ~/.bashrc

RUN mkdir -p /root/miniconda3 && \
apt-get --allow-releaseinfo-change update && \
apt-get install --no-install-recommends -y gcc g++ libgl1 libgl1-mesa-dev && \
apt-get install --no-install-recommends -y procps iproute2 less vim && \
apt-get install --no-install-recommends -y wget && \
wget -q https://repo.anaconda.com/miniconda/Miniconda3-py39_4.12.0-Linux-x86_64.sh -O ~/miniconda3/miniconda.sh && \
apt-get purge wget -y && apt-get autoremove -y && apt-get clean && \
Expand Down
3 changes: 3 additions & 0 deletions studio/config/docker/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ FROM --platform=linux/amd64 python:3.8.16-slim

WORKDIR /app

RUN echo 'alias ll="ls -la"' >> ~/.bashrc

RUN mkdir -p /root/miniconda3 && \
apt-get --allow-releaseinfo-change update && \
apt-get install --no-install-recommends -y procps iproute2 less vim && \
apt-get install --no-install-recommends -y wget && \
wget -q https://repo.anaconda.com/miniconda/Miniconda3-py39_4.12.0-Linux-x86_64.sh -O ~/miniconda3/miniconda.sh && \
apt-get purge wget -y && apt-get autoremove -y && apt-get clean && \
Expand Down