Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/embed #1182

Merged
merged 13 commits into from
Feb 27, 2024
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 1. build
FROM node:17-alpine AS frontend_builder
FROM node:17.9-alpine AS frontend_builder

ARG GIT_TAG
ARG GIT_BRANCH
Expand Down
10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,21 @@ build-netlify:
NODE_OPTIONS=--openssl-legacy-provider npm run build && \
netlify deploy --prod --dir=dist


run-dev:
GIT_TAG=$(shell git describe --tags --abbrev=0 HEAD) \
GIT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD) \
GIT_REVISION=$(shell git rev-parse --short HEAD) \
PUBLIC_PATH=/app/ \
NODE_OPTIONS=--openssl-legacy-provider npm start

run-docker-dev:
GIT_TAG=$(shell git describe --tags --abbrev=0 HEAD) \
GIT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD) \
GIT_REVISION=$(shell git rev-parse --short HEAD) \
PUBLIC_PATH=/app/ \
docker-compose -f docker-compose-dev.yml up

run-dev-build:
run-docker-dev-build:
GIT_TAG=$(shell git describe --tags --abbrev=0 HEAD) \
GIT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD) \
GIT_REVISION=$(shell git rev-parse --short HEAD) \
Expand Down
17 changes: 16 additions & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@

## This rule redirects to an external API, signing requests with a secret
[[redirects]]
from = "/api/socket.io/*"
to = "https://impresso-project.ch/api/socket.io/:splat"
status = 200
force = true

## This rule redirects to an external API, signing requests with a secret
[[redirects]]
from = "/api/proxy/*"
to = "https://impresso-project.ch/api/proxy/:splat"
status = 200
force = true

[[redirects]]
from = "/*"
to = "/index.html"
status = 200
status = 200
Loading