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

Improve Compatibility with Updated Packages and Resolve Errors in Development Setup #207

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.storybook
.vscode
build
node_modules
.storybook
.vscode
build
node_modules
6 changes: 3 additions & 3 deletions .env.production
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
REACT_APP_GA_TRACKING_ID=G-8L6X5K54RM
INLINE_RUNTIME_CHUNK=false
ENABLE_PHI=false
REACT_APP_GA_TRACKING_ID=G-8L6X5K54RM
INLINE_RUNTIME_CHUNK=false
ENABLE_PHI=false
56 changes: 28 additions & 28 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local
.eslintcache

npm-debug.log*
yarn-debug.log*
yarn-error.log*

.vscode

/src/index.css
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# dependencies
/node_modules
/.pnp
.pnp.js
# testing
/coverage
# production
/build
# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local
.eslintcache
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.vscode
/src/index.css
.idea
3 changes: 2 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"semi": false,
"singleQuote": true
"singleQuote": true,
"endOfLine": "lf"
}
22 changes: 11 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM quay.io/pcdc/node-lts-alpine:18-alpine as build-stage
WORKDIR /app
COPY . .
RUN npm ci && npm run build

FROM quay.io/pcdc/nginx:1.22-alpine
COPY --from=build-stage /app/build /usr/share/nginx/html
COPY ./nginx /etc/nginx/conf.d
COPY ./dockerStart.sh .
RUN apk add --no-cache bash
CMD bash ./dockerStart.sh
FROM quay.io/pcdc/node-lts-alpine:18-alpine as build-stage
WORKDIR /app
COPY . .
RUN npm ci && npm run build
FROM quay.io/pcdc/nginx:1.22-alpine
COPY --from=build-stage /app/build /usr/share/nginx/html
COPY ./nginx /etc/nginx/conf.d
COPY ./dockerStart.sh .
RUN apk add --no-cache bash
CMD bash ./dockerStart.sh
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,3 @@ To learn React, check out the [React documentation](https://reactjs.org/).
## Contribute

`npx prettier [filepath] -w`

22 changes: 11 additions & 11 deletions dockerStart.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/sh
#
# Little startup script launching nginx
#
set -eu

# add https://gearbox-dev-data-bucket-with-versioning.s3.amazonaws.com after connect-src in content security policy
echo "$GEARBOX_S3_BUCKET"
sed -i -e "s|connect-src|& $GEARBOX_S3_BUCKET|" /usr/share/nginx/html/index.html

/usr/sbin/nginx -g 'daemon off;'
#!/bin/sh
#
# Little startup script launching nginx
#
set -eu
# add https://gearbox-dev-data-bucket-with-versioning.s3.amazonaws.com after connect-src in content security policy
echo "$GEARBOX_S3_BUCKET"
sed -i -e "s|connect-src|& $GEARBOX_S3_BUCKET|" /usr/share/nginx/html/index.html
/usr/sbin/nginx -g 'daemon off;'
24 changes: 12 additions & 12 deletions nginx/app.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
server {
listen 80;
server_name portal-proxy;

location / {
root /usr/share/nginx/html;
index index.html;
try_files $uri /index.html;
expires 30d;
add_header X-Frame-Options DENY always;
}
}
server {
listen 80;
server_name portal-proxy;
location / {
root /usr/share/nginx/html;
index index.html;
try_files $uri /index.html;
expires 30d;
add_header X-Frame-Options DENY always;
}
}
Loading