Skip to content

Commit

Permalink
fix: adjust Dockerfile to copy files from browser folder into nginx h…
Browse files Browse the repository at this point in the history
…tml folder rather than adjusting paths used later

chore: copy 3rdpartylicenses.txt as well
chore: replace redaktion by repository URL
fix: typo in proxy.conf.js
  • Loading branch information
tkubica-edu committed Aug 6, 2024
1 parent 0a54722 commit f56749f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ jobs:
frontend:
image: ${{ github.repository }}:${{ github.sha }}
env:
EDU_SHARING_API_URL: https://redaktion.openeduhub.net/edu-sharing/rest
EDU_SHARING_API_URL: https://repository.staging.openeduhub.net/edu-sharing/rest
ports:
- 8080:80
steps:
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM nginx

COPY docker-entrypoint.d /docker-entrypoint.d
COPY docker-entrypoint.d /docker-entrypoint.d
COPY nginx.page.conf /etc/nginx/conf.d/default.conf
COPY dist/oeh-search-frontend/ /usr/share/nginx/html/
COPY dist/oeh-search-frontend/browser/ /usr/share/nginx/html/
COPY dist/oeh-search-frontend/3rdpartylicenses.txt /usr/share/nginx/html/3rdpartylicenses.txt
4 changes: 2 additions & 2 deletions nginx.page.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ server {

# Serve supported languages from the respective directories.
location /en-US/ {
alias /usr/share/nginx/html/browser/en-US/;
alias /usr/share/nginx/html/en-US/;
try_files $uri /en-US/index.html;
}
location /de/ {
alias /usr/share/nginx/html/browser/de/;
alias /usr/share/nginx/html/de/;
try_files $uri /de/index.html;
}

Expand Down
2 changes: 1 addition & 1 deletion src/proxy.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require('dotenv').config();
const PROXY_CONFIG = {};

if (process.env.RELAY_PROXY_URL) {
// For some reason, the proxy doesn't forwarding the path with the request anymore. Therefore,
// For some reason, the proxy doesn't forward the path with the request anymore. Therefore,
// we hard-code `/graphql` here for now.
PROXY_CONFIG['/relay/graphql'] = {
target: process.env.RELAY_PROXY_URL + '/graphql',
Expand Down

0 comments on commit f56749f

Please sign in to comment.