diff --git a/Dockerfile b/Dockerfile index 50d0129..bfafda1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ FROM alpine:latest as build ENV REACT_APP_FIREBASE_API_KEY = ${REACT_APP_FIREBASE_API_KEY} ENV REACT_APP_FIREBASE_APP_ID = ${REACT_APP_FIREBASE_APP_ID} ENV REACT_APP_ENVIRONMENT = ${REACT_APP_ENVIRONMENT} +ENV DEPLOY_SERVICE = ${DEPLOY_SERVICE} RUN apk add --update nodejs npm RUN npm install --global yarn @@ -12,6 +13,7 @@ WORKDIR /usr/src RUN yarn RUN yarn build +RUN if [[ DEPLOY_SERVICE !== caprover ]]; then echo '/* https://clockify-pomodoro-timer.franp.site 200' | cat >build/_redirects fi FROM nginx:1.23.1-alpine EXPOSE 80 diff --git a/docker-compose.yml b/docker-compose.yml index 541b465..139e126 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,3 +9,4 @@ services: - REACT_APP_FIREBASE_API_KEY: {REACT_APP_FIREBASE_API_KEY} - REACT_APP_FIREBASE_APP_ID: {REACT_APP_FIREBASE_APP_ID} - REACT_APP_ENVIRONMENT: {REACT_APP_ENVIRONMENT} + - DEPLOY_SERVICE: {DEPLOY_SERVICE} \ No newline at end of file diff --git a/package.json b/package.json index 29d28d5..fc22e52 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "scripts": { "start": "react-scripts start", - "build": "react-scripts build --openssl-legacy-provider && echo '/* /index.html 200' | cat >build/_redirects", + "build": "react-scripts build", "test": "react-scripts test", "eject": "react-scripts eject" },