diff --git a/ecs/restore-dbdump/Dockerfile b/ecs/restore-dbdump/Dockerfile index 858c3dc9..cdfbd0f8 100644 --- a/ecs/restore-dbdump/Dockerfile +++ b/ecs/restore-dbdump/Dockerfile @@ -1,6 +1,10 @@ -FROM python:3.9 +FROM python:3.12-slim-bookworm ENV TZ="Asia/Tokyo" +# pythonの標準出力をバッファリングしないフラグ +ENV PYTHONUNBUFFERED=1 +# pythonのバイトコードを生成しないフラグ +ENV PYTHONDONTWRITEBYTECODE=1 WORKDIR /usr/src/app COPY Pipfile Pipfile.lock ./ @@ -12,6 +16,7 @@ RUN apt update && apt install -y less vim curl wget gzip unzip sudo lsb-release # mysqlをインストール RUN \ wget https://dev.mysql.com/get/mysql-apt-config_0.8.29-1_all.deb && \ + apt install -y gnupg && \ dpkg -i mysql-apt-config_0.8.29-1_all.deb < mysql_dpkg_selection.txt && \ apt update && \ apt install -y mysql-client diff --git a/ecs/restore-dbdump/Pipfile b/ecs/restore-dbdump/Pipfile index f032c7ea..2cbab477 100644 --- a/ecs/restore-dbdump/Pipfile +++ b/ecs/restore-dbdump/Pipfile @@ -10,7 +10,7 @@ autopep8 = "*" flake8 = "*" [requires] -python_version = "3.9" +python_version = "3.12" [pipenv] allow_prereleases = true diff --git a/ecs/restore-dbdump/Pipfile.lock b/ecs/restore-dbdump/Pipfile.lock index 02f0cb52..399e2a98 100644 --- a/ecs/restore-dbdump/Pipfile.lock +++ b/ecs/restore-dbdump/Pipfile.lock @@ -1,11 +1,11 @@ { "_meta": { "hash": { - "sha256": "cc5f54bfb2073051a26f113ceac64e12fdd0bf8faa36f1a42210cc9c921c134b" + "sha256": "2f7808325e11704ced6ad10c85e1d583663a03d7ccabaa9696ab1fe133a6b30c" }, "pipfile-spec": 6, "requires": { - "python_version": "3.9" + "python_version": "3.12" }, "sources": [ { @@ -19,19 +19,21 @@ "develop": { "autopep8": { "hashes": [ - "sha256:1fa8964e4618929488f4ec36795c7ff12924a68b8bf01366c094fc52f770b6e7", - "sha256:2bb76888c5edbcafe6aabab3c47ba534f5a2c2d245c2eddced4a30c4b4946357" + "sha256:89440a4f969197b69a995e4ce0661b031f455a9f776d2c5ba3dbd83466931758", + "sha256:ce8ad498672c845a0c3de2629c15b635ec2b05ef8177a6e7c91c74f3e9b51128" ], "index": "pypi", - "version": "==2.1.0" + "markers": "python_version >= '3.9'", + "version": "==2.3.2" }, "flake8": { "hashes": [ - "sha256:33f96621059e65eec474169085dc92bf26e7b2d47366b70be2f67ab80dc25132", - "sha256:a6dfbb75e03252917f2473ea9653f7cd799c3064e54d4c8140044c5c065f53c3" + "sha256:1cbc62e65536f65e6d754dfe6f1bada7f5cf392d6f5db3c2b85892466c3e7c1a", + "sha256:c586ffd0b41540951ae41af572e6790dbd49fc12b3aa2541685d253d9bd504bd" ], "index": "pypi", - "version": "==7.0.0" + "markers": "python_full_version >= '3.8.1'", + "version": "==7.1.2" }, "mccabe": { "hashes": [ @@ -43,11 +45,11 @@ }, "pycodestyle": { "hashes": [ - "sha256:41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f", - "sha256:44fe31000b2d866f2e41841b18528a505fbd7fef9017b04eff4e2648a0fadc67" + "sha256:46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3", + "sha256:6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521" ], "markers": "python_version >= '3.8'", - "version": "==2.11.1" + "version": "==2.12.1" }, "pyflakes": { "hashes": [ @@ -56,14 +58,6 @@ ], "markers": "python_version >= '3.8'", "version": "==3.2.0" - }, - "tomli": { - "hashes": [ - "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", - "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f" - ], - "markers": "python_version < '3.11'", - "version": "==2.0.1" } } }