sst/tinkeing #2

Merged
mhu merged 3 commits from sst/tinkeing into master 2024-04-25 20:37:15 +02:00
6 changed files with 17 additions and 1 deletions
Showing only changes of commit 5b6f4e16ef - Show all commits

1
.dockerignore Normal file
View File

@ -0,0 +1 @@
start_server.sh

6
Dockerfile Normal file
View File

@ -0,0 +1,6 @@
FROM alpine:latest
RUN apk add --no-cache python3 py3-pip python3-dev py3-setuptools gcc python3-dev jpeg-dev zlib-dev musl-dev py3-gunicorn
COPY . /home/shimatta/kenkyusho
WORKDIR /home/shimatta/kenkyusho
RUN python3 -m venv /home/shimatta/kenkyusho/.venv && . /home/shimatta/kenkyusho/.venv/bin/activate && pip install -r requirements.txt
ENTRYPOINT ["/home/shimatta/kenkyusho/entrypoint.sh"]

6
entrypoint.sh Executable file
View File

@ -0,0 +1,6 @@
#!/bin/sh
source /home/shimatta/kenkyusho/.venv/bin/activate
cd /home/shimatta/kenkyusho/shimatta_kenkyusho
python manage.py migrate --settings shimatta_kenkyusho.settings_production
python manage.py collectstatic --settings shimatta_kenkyusho.settings_production
gunicorn -w 4 shimatta_kenkyusho.wsgi:application

View File

@ -14,7 +14,6 @@ lazy-object-proxy==1.6.0
MarkupSafe==2.0.1
mccabe==0.6.1
Pillow==8.3.1
psycopg2==2.9.1
pylint==2.9.6
pytz==2021.1
qrcode==7.2
@ -23,3 +22,5 @@ six==1.16.0
sqlparse==0.4.1
toml==0.10.2
wrapt==1.12.1
psycopg2-binary==2.9.9
gunicorn==21.2.0

View File

@ -138,6 +138,7 @@ DATABASES = {
'USER': db_user,
'PASSWORD': db_pw,
'HOST': get_env_value('DJANGO_POSTGRESQL_SOCKET'),
'PORT': get_env_value('DJANGO_POSTGRESQL_PORT'),
}
}

1
start_server.sh Executable file
View File

@ -0,0 +1 @@
podman run -it -e DJANGO_SECRET_KEY=<secret_key> -e DJANGO_ALLOWED_HOST=parts.shimatta.net -e DJANGO_STATIC_ROOT=/var/static -e DJANGO_MEDIA_URL=media -e DJANGO_MEDIA_ROOT=/var/media -e DJANGO_POSTGRESQL_SOCKET=host.docker.internal -e DJANGO_POSTGRESQL_PORT=2345 -e DJANGO_POSTGRESQL_USER=<db_user> -e DJANGO_POSTGRESQL_PW=<db_pass> -v /var/parts/static:/var/static -v /var/parts/media:/var/media -p 8000:8000 --entrypoint /bin/sh localhost/kenkyusho:0.1