really fix pipeline

This commit is contained in:
tawoe 2024-10-24 08:12:29 +02:00
parent e106ef8b73
commit 5aead1bf3d
3 changed files with 26 additions and 29 deletions

View File

@ -1,5 +1,3 @@
server {
listen 8080;
server_name apimanager;
location / {
@ -12,12 +10,11 @@ server {
}
location /en/static {
alias /usr/share/nginx/html;
alias /opt/app-root/src;
}
location /es/static {
alias /usr/share/nginx/html;
alias /opt/app-root/src;
}
location /static {
alias /usr/share/nginx/html;
alias /opt/app-root/src;
}
}

View File

@ -5,8 +5,6 @@ RUN pip install -r /app/requirements.txt
WORKDIR /app
RUN python ./apimanager/manage.py collectstatic --noinput
FROM nginxinc/nginx-unprivileged:stable
COPY .github/apimanager.conf /etc/nginx/conf.d/
COPY nginx.apimanager.conf /etc/nginx/conf.d/apimanager.conf
COPY --from=builder /app/apimanager/static /usr/share/nginx/html
CMD nginx -g "daemon off;"

View File

@ -1,21 +1,23 @@
# nginx server configuration for apimanager
server {
listen 80 default_server;
listen [::]:80 default_server;
listen 8080;
server_name apimanager;
server_name apimanager;
location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# enable this if and only if you use HTTPS
# proxy_set_header X-Forwarded-Proto https;
proxy_set_header Host $http_host;
proxy_redirect off;
proxy_pass http://127.0.0.1:8000;
}
location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# enable this if and only if you use HTTPS
# proxy_set_header X-Forwarded-Proto https;
proxy_set_header Host $http_host;
proxy_redirect off;
proxy_pass http://127.0.0.1:8000;
}
location /static {
alias /var/www/apimanager/static-collected;
}
location /en/static {
alias /usr/share/nginx/html;
}
location /es/static {
alias /usr/share/nginx/html;
}
location /static {
alias /usr/share/nginx/html;
}
}