Skip to content

Commit

Permalink
chore: use newer nginx docker image version to support both arm64 and…
Browse files Browse the repository at this point in the history
… amd64 (#1539)

* test why deploy action is not working

* Update README.md

Add SonarCloud badge

* chore(deps-dev): bump karma from 6.4.3 to 6.4.4

Bumps [karma](https://github.com/karma-runner/karma) from 6.4.3 to 6.4.4.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](karma-runner/karma@v6.4.3...v6.4.4)

---
updated-dependencies:
- dependency-name: karma
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore(deps-dev): bump @types/node from 20.14.11 to 22.0.0

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.14.11 to 22.0.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore(deps-dev): bump the eslint group with 2 updates

Bumps the eslint group with 2 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser).


Updates `@typescript-eslint/eslint-plugin` from 7.17.0 to 7.18.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.18.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 7.17.0 to 7.18.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.18.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
...

Signed-off-by: dependabot[bot] <[email protected]>

* feat: Added findByIdAccess method to Proposal and Sample APIs

* Add tests of findByIdAccess method for Proposal and Sample APIs

* improved testcase for proposal fetchById

* improved testcase for sample fetchById

* sync functionalAccounts between FE and BE

* update findByIdAccess endpoints for sample & proposals

* minor variable naming change.

* Minor change in SDK file

* minor SDK endpoint description change

* first draft of the datafiles action

* fixed most of the bugs for the new actions. Added test configuration

* fixed linting issues

* working on fixing unit testing

* fixed linting errors

* added missing config for datafiles.component.spec.ts

* renamed dataset Input to actionDataset to avoid HTML element conflict

* datafiles actions tests, data files action test almost done

* Completed tests for datafiles action

* fixed linting. Added documentation

* updated documentation with images

* trying to figure out why images are not pushed to repo

* implemented test solution suggested in review and updated documentation

* fixed linting issues

* chore: Update nginx base image to version 1.21-alpine

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Igor Khokhriakov <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Novelli <[email protected]>
  • Loading branch information
4 people authored Jul 31, 2024
1 parent 85c7348 commit d621d3d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
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
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

0 comments on commit d621d3d

Please sign in to comment.