Skip to content

Commit

Permalink
Python version and library update
Browse files Browse the repository at this point in the history
  • Loading branch information
showwin committed Oct 20, 2024
1 parent 1e3aabc commit 8a7c0c7
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion admin/ami/scripts/base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-bu
rbenv install $RUBY_VERSION && rbenv rehash && rbenv global $RUBY_VERSION

# Install Python
export PYTHON_VERSION=3.8.5
export PYTHON_VERSION=3.13.0
sudo apt-get install -y zlib1g-dev libbz2-dev libffi-dev libsqlite3-dev liblzma-dev libmariadb-dev pkgconf
sudo apt-get clean
git clone https://github.com/pyenv/pyenv.git ~/.pyenv
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ services:
app:
build:
context: .
dockerfile: ./docker/app/ruby/Dockerfile
dockerfile: ./docker/app/python/Dockerfile
args:
BASE_IMAGE: ishocon1-app-base:latest
# ローカルで base image をビルドしない場合は以下を利用すること
# BASE_IMAGE: showwin/ishocon1_app_base:latest
image: ishocon1-app-ruby:latest
image: ishocon1-app-python:latest
environment:
ISHOCON_APP_LANG: "${ISHOCON_APP_LANG-ruby}"
ISHOCON_APP_LANG: "${ISHOCON_APP_LANG-python}"
healthcheck:
test: ["CMD", "test", "-f", "/tmp/ishocon-app"]
interval: 10s
Expand Down
2 changes: 1 addition & 1 deletion docker/app/python/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BASE_IMAGE=ishocon1-app-base:latest
FROM ${BASE_IMAGE}

ENV PYTHON_VERSION=3.8.5
ENV PYTHON_VERSION=3.13.0

# Python のインストール
RUN sudo apt-get update && \
Expand Down
2 changes: 1 addition & 1 deletion webapp/python/.python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.8.5
3.13.0
14 changes: 7 additions & 7 deletions webapp/python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
click==7.1.2
Flask==1.1.2
gunicorn==20.0.4
itsdangerous==1.1.0
Jinja2==2.11.2
MarkupSafe==1.1.1
click==8.1.7
Flask==3.0.3
gunicorn==23.0.0
itsdangerous==2.2.0
Jinja2==3.1.4
MarkupSafe==3.0.2
mysqlclient==2.2.4
Werkzeug==1.0.1
Werkzeug==3.0.4

0 comments on commit 8a7c0c7

Please sign in to comment.