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.

Sign up for GitHub

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

Dependabot 4777 fixes #5043

Merged
merged 16 commits into from
Feb 8, 2024
Merged

Dependabot 4777 fixes #5043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5a96433
Upgrade node to node 20, nginx to 1.25.3 and fix dependabot issues
Jan 30, 2024
bb057f3
Merge pull request #5027 from bcgov/dev-release-9.5.6
divyav-aot Jan 31, 2024
81b3056
Merge pull request #5034 from bcgov/dev
divyav-aot Feb 1, 2024
670b0ce
Adjusted fee and payment service to 1) create invoices with time stam…
Aman-Hundal Feb 2, 2024
c54c654
Fix dependabot issues in request and notifciation
Feb 2, 2024
c225a4e
Adjusted invoice template to account for better trakcing of previous …
Aman-Hundal Feb 5, 2024
171771b
Merge pull request #5038 from bcgov/test-AH-2878
Aman-Hundal Feb 5, 2024
cf32306
Added spaces to invoice lines + formatted previoiusly paid amt dollar…
Aman-Hundal Feb 6, 2024
e0ee83d
Merge pull request #5039 from bcgov/test-AH-2878
Aman-Hundal Feb 6, 2024
6432df2
invoice adjustment
Aman-Hundal Feb 6, 2024
b97b4cf
Merge pull request #5040 from bcgov/test-AH-2878
Aman-Hundal Feb 6, 2024
36b2e40
invoice spacing adjustment final
Aman-Hundal Feb 6, 2024
837ab5f
Merge branch 'dev' of https://github.com/bcgov/foi-flow into test-AH-…
Aman-Hundal Feb 6, 2024
22a120a
Merge pull request #5041 from bcgov/test-AH-2878
Aman-Hundal Feb 6, 2024
a1b2dbb
Merge pull request #5042 from bcgov/dev
Aman-Hundal Feb 7, 2024
8ca4439
Merge branch 'dev-rook-shiva-4777' into test-rook-4777-shiva
Feb 8, 2024
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
4 changes: 2 additions & 2 deletions forms-flow-web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# base image
# FROM node:14.17.0-alpine as build-stage
FROM artifacts.developer.gov.bc.ca/docker-remote/node:14.17.0-alpine as build-stage
FROM artifacts.developer.gov.bc.ca/docker-remote/node:20.10.0-alpine as build-stage

# set working directory
WORKDIR /forms-flow-web/app
Expand Down Expand Up @@ -84,7 +84,7 @@ RUN npm install --unsafe-perm
COPY . /forms-flow-web/app/
RUN npm run build

FROM artifacts.developer.gov.bc.ca/docker-remote/nginx:1.17 as production-stage
FROM artifacts.developer.gov.bc.ca/docker-remote/nginx:1.25.3 as production-stage
RUN mkdir /app
COPY --from=build-stage /forms-flow-web/app/build /usr/share/nginx/html
COPY nginx.conf /etc/nginx/nginx.conf
Expand Down
6 changes: 3 additions & 3 deletions forms-flow-web/Dockerfile.local
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# base image
# FROM node:14.17.0-alpine as build-stage
FROM node:14.17.0-alpine as build-stage
FROM node:20.10.0-alpine as build-stage

# set working directory
WORKDIR /forms-flow-web/app
Expand Down Expand Up @@ -72,12 +72,12 @@ COPY package-lock.json /forms-flow-web/app/package-lock.json
COPY package.json /forms-flow-web/app/package.json


RUN npm install --unsafe-perm
RUN npm install
#RUN npm install [email protected] -g --silent
COPY . /forms-flow-web/app/
RUN npm run build

FROM nginx:1.17 as production-stage
FROM nginx:1.25.3 as production-stage
RUN mkdir /app
COPY --from=build-stage /forms-flow-web/app/build /usr/share/nginx/html
COPY nginx.conf /etc/nginx/nginx.conf
Expand Down
Loading
Loading