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

chore: use newer nginx docker image version to support both arm64 and amd64 #1539

Merged
merged 30 commits into from
Jul 31, 2024
Merged

chore: use newer nginx docker image version to support both arm64 and amd64 #1539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
03d8e4b
test why deploy action is not working
Junjiequan Jul 31, 2024
9c4d627
Update README.md
Ingvord Jun 11, 2024
7c7f71e
chore(deps-dev): bump karma from 6.4.3 to 6.4.4
dependabot[bot] Jul 29, 2024
2fc580d
chore(deps-dev): bump @types/node from 20.14.11 to 22.0.0
dependabot[bot] Jul 29, 2024
9a92236
chore(deps-dev): bump the eslint group with 2 updates
dependabot[bot] Jul 29, 2024
28fc0a7
feat: Added findByIdAccess method to Proposal and Sample APIs
Junjiequan Jul 22, 2024
34d0499
Add tests of findByIdAccess method for Proposal and Sample APIs
Junjiequan Jul 24, 2024
6654074
improved testcase for proposal fetchById
Junjiequan Jul 29, 2024
3d374eb
improved testcase for sample fetchById
Junjiequan Jul 29, 2024
a142960
sync functionalAccounts between FE and BE
Junjiequan Jul 29, 2024
2559181
update findByIdAccess endpoints for sample & proposals
Junjiequan Jul 29, 2024
42e6374
minor variable naming change.
Junjiequan Jul 29, 2024
aa47f4f
Minor change in SDK file
Junjiequan Jul 29, 2024
d6d065a
minor SDK endpoint description change
Junjiequan Jul 29, 2024
c3e5a9a
first draft of the datafiles action
nitrosx Jul 17, 2024
899b03b
fixed most of the bugs for the new actions. Added test configuration
nitrosx Jul 22, 2024
b06a2ed
fixed linting issues
nitrosx Jul 23, 2024
d20bc83
working on fixing unit testing
nitrosx Jul 23, 2024
3f80238
fixed linting errors
nitrosx Jul 23, 2024
d647da1
added missing config for datafiles.component.spec.ts
Junjiequan Jul 23, 2024
3a97859
renamed dataset Input to actionDataset to avoid HTML element conflict
Junjiequan Jul 23, 2024
6af0617
datafiles actions tests, data files action test almost done
nitrosx Jul 26, 2024
1560cf9
Completed tests for datafiles action
nitrosx Jul 29, 2024
2a99e78
fixed linting. Added documentation
nitrosx Jul 29, 2024
6f0757c
updated documentation with images
nitrosx Jul 29, 2024
1070449
trying to figure out why images are not pushed to repo
nitrosx Jul 29, 2024
c159370
implemented test solution suggested in review and updated documentation
nitrosx Jul 30, 2024
3afe71d
fixed linting issues
nitrosx Jul 30, 2024
95d37bf
Merge branch 'master' into test
Junjiequan Jul 31, 2024
aaff4c1
chore: Update nginx base image to version 1.21-alpine
Junjiequan Jul 31, 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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN npm ci
COPY . /frontend/
RUN npx ng build

FROM nginx:1.12-alpine
FROM nginx:1.21-alpine
RUN rm -rf /usr/share/nginx/html/*
COPY --from=builder /frontend/dist/ /usr/share/nginx/html/
COPY scripts/nginx.conf /etc/nginx/nginx.conf
Expand Down
7 changes: 2 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# Frontend: SciCat GUI



<img src="https://github.com/SciCatProject/frontend/blob/master/src/assets/images/site-logo.png" alt="sci-cat-logo" width="100">



[![Test Status](https://github.com/SciCatProject/frontend/actions/workflows/deploy.yml/badge.svg?branch=master)](https://github.com/SciCatProject/frontend/actions)
[![DeepScan grade](https://deepscan.io/api/teams/8394/projects/21314/branches/609376/badge/grade.svg)](https://deepscan.io/dashboard#view=project&tid=8394&pid=21314&bid=609376)
[![Known Vulnerabilities](https://snyk.io/test/github/SciCatProject/frontend/master/badge.svg?targetFile=package.json)](https://snyk.io/test/github/SciCatProject/frontend/master?targetFile=package.json)
Expand All @@ -21,11 +17,12 @@ as well as the option to carry out actions (i.e. archiving and publishing) and a
For the full documentation please go to the [SciCat home page](https://scicatproject.github.io/) and follow the [documentation link](https://scicatproject.github.io/documentation)

## Configuration

- [Site logo related images](SITE-LOGO-CONFIGURATION.md)

## License

See the [LICENSE](LICENSE) file for details
See the [LICENSE](LICENSE) file for details.

## Acknowledgments

Expand Down
Loading