From 29a723a6d4af7e1af3a75513799f7780e804f3be Mon Sep 17 00:00:00 2001 From: yoneyan Date: Sun, 15 Sep 2024 19:18:15 +0900 Subject: [PATCH] =?UTF-8?q?#43=20Dockerfile=E3=81=AE=E6=9B=B4=E6=96=B0&wor?= =?UTF-8?q?kflows=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-dev.yaml | 12 +++++++++++- Dockerfile | 4 ++-- Pipfile | 16 ++++++++-------- Pipfile.lock | 2 +- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml index 8395066..2d848f0 100644 --- a/.github/workflows/build-dev.yaml +++ b/.github/workflows/build-dev.yaml @@ -5,9 +5,19 @@ on: paths: - '.github/**' - 'files/**' + - 'custom_admin/**' + - 'custom_auth/**' - 'dsbd/**' + - 'ip/**' + - 'noc/**' + - 'notice/**' + - 'router/**' + - 'service/**' + - 'ticket/**' + - 'manage.py' - 'Dockerfile' - - 'requirements.txt' + - 'Pipfile' + - 'Pipfile.lock' jobs: push_to_registry: diff --git a/Dockerfile b/Dockerfile index 59d40d8..94395c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11.4 AS app +FROM python:3.12 AS app RUN pip install --upgrade pip && pip install pipenv RUN apt-get update && \ @@ -17,7 +17,7 @@ RUN pip install gunicorn daphne ENV PYTHONPATH=/opt/app/ ADD Pipfile /opt/app/Pipfile ADD Pipfile.lock /opt/app/Pipfile.lock -RUN pipenv install --system +RUN pipenv sync --system ADD manage.py /opt/app/ ADD dsbd/ /opt/app/dsbd/ diff --git a/Pipfile b/Pipfile index b1e16d9..14893a3 100644 --- a/Pipfile +++ b/Pipfile @@ -10,25 +10,25 @@ autobahn = "==24.*" automat = "==24.*" certifi = "==2024.*" cffi = "==1.*" -channels = "==4.1.0" +channels = "==4.*" charset-normalizer = "==3.*" -constantly = "==23.10.4" +constantly = "==23.*" cryptography = "==43.*" -daphne = "==4.1.2" -django = "==5.1.*" +daphne = "==4.*" +django = "==5.*" django-auth-ldap = "==4.*" django-countries = "==7.*" django-debug-toolbar = "==4.*" -django-qrcode = "==0.3" -django-widget-tweaks = "==1.5.0" -hyperlink = "==21.0.0" +django-qrcode = "==0.*" +django-widget-tweaks = "==1.*" +hyperlink = "==21.*" idna = "==3.*" incremental = "==24.*" markdown = "==3.*" mysqlclient = "==2.*" pyasn1 = "==0.6.*" pyasn1-modules = "==0.4.*" -pycparser = "==2.22" +pycparser = "==2.*" pyopenssl = "==24.*" pyotp = "==2.9.0" pypng = "==0.20220715.0" diff --git a/Pipfile.lock b/Pipfile.lock index f87a2d4..19d05ee 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "f6f11aac9ad521c1635f4145cdc080318045ce3955e3c229433edb4f004d6887" + "sha256": "acd94fdedbf8620e3e75cfc8125feb96f1376853e081750056fe48460d2a81e5" }, "pipfile-spec": 6, "requires": {