artin/API-Manager
1
0
Fork 0
mirror of https://github.com/OpenBankProject/API-Manager.git synced 2026-02-06 10:59:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'UPSTREAM/develop' into new_gunicorn

Browse Source 
# Conflicts:
#	requirements.txt
This commit is contained in:
tawoe 2024-10-23 12:07:32 +02:00
commit 878e807a74
4 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/apimanager.conf vendored
View File

@ -1,9 +1,6 @@
#http {
# server {
# listen 8080 default_server;
# listen [::]:8080 default_server;
server_name apimanager;
server {
listen 8080;
server_name apimanager;
location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@ -15,13 +12,12 @@
}
location /en/static {
alias /opt/app-root/src;
alias /usr/share/nginx/html;
}
location /es/static {
alias /opt/app-root/src;
alias /usr/share/nginx/html;
}
location /static {
alias /opt/app-root/src;
alias /usr/share/nginx/html;
}
# }
#}
}

3
Dockerfile
View File

@ -1,13 +1,10 @@
FROM python:3.10
USER root
COPY . /app
COPY .github/local_settings_container.py /app/apimanager/apimanager/local_settings.py
COPY .github/gunicorn.conf.py /app/gunicorn.conf.py
RUN pip install -r /app/requirements.txt
WORKDIR /app
RUN ./apimanager/manage.py migrate
RUN chgrp -R 0 /app && chmod -R g+rwX /app
USER 501
WORKDIR /app/apimanager
EXPOSE 8000
CMD ["gunicorn", "--bind", ":8000", "--config", "../gunicorn.conf.py", "apimanager.wsgi"]

16
Dockerfile_nginx
View File

@ -1,22 +1,12 @@
FROM python:3.10 AS builder
USER 0
COPY . /app
RUN cp /app/.github/local_settings_container.py /app/apimanager/apimanager/local_settings.py
RUN pip install -r /app/requirements.txt
RUN chown 501 /
RUN chown -R 501 /app
RUN chgrp -R 0 /app && chmod -R g+rwX /app
USER 1001
WORKDIR /app
RUN python ./apimanager/manage.py collectstatic --noinput
FROM nginx:mainline-alpine
USER 0
#RUN dnf update -y
ADD .github/apimanager.conf "${NGINX_DEFAULT_CONF_PATH}"
COPY --from=builder /app/apimanager/static /opt/app-root/src
RUN chgrp -R 0 /opt/app-root/src/ && chmod -R g+rwX /opt/app-root/src/
USER 1001
FROM nginxinc/nginx-unprivileged:stable
COPY .github/apimanager.conf /etc/nginx/conf.d/
COPY --from=builder /app/apimanager/static /usr/share/nginx/html
CMD nginx -g "daemon off;"

2
requirements.txt
View File

@ -1,4 +1,4 @@
psycopg2-binary
psycopg2
#Django==1.11.7
Django==2.2.28
oauthlib==3.2.2