Skip to content

Commit

Permalink
Merge branch 'dev' into DDS-2149-Add-information-regarding-which-inst…
Browse files Browse the repository at this point in the history
…ance-in-INVOICING-CRONJOB
  • Loading branch information
rv0lt authored Oct 9, 2024
2 parents dcbff91 + 1bdce67 commit 08c4954
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish_and_trivyscan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ jobs:
uses: actions/download-artifact@v4
with:
name: technical-overview-pdf
path: dds_web/static/dds-technical-overview.pdf
path: dds_web/static
- name: Download troubleshooting PDF
uses: actions/download-artifact@v4
with:
name: troubleshooting-pdf
path: dds_web/static/dds-troubleshooting.pdf
path: dds_web/static
- name: Docker metadata
id: meta
uses: docker/metadata-action@v5
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ Equally, if you want to tear down you need to run pytest _twice_ without it, as

## Production Instance

The production version of the backend image is published at [Dockerhub](https://hub.docker.com/repository/docker/scilifelabdatacentre/dds-backend). It can also be built by running:
The production version of the backend image is published at the [GitHub Container Registry (GHCR)](ghcr.io/scilifelabdatacentre/dds-backend). It can also be built by running:

```bash
docker build --target production -f Dockerfiles/backend.Dockerfile .
Expand Down
5 changes: 5 additions & 0 deletions SPRINTLOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -435,3 +435,8 @@ _Nothing merged during this sprint_
# 2024-09-24 - 2024-10-04

- Add option to motd command for sending to unit users only([#1552](https://github.com/ScilifelabDataCentre/dds_web/pull/1552))

# 2024-10-07 - 2024-10-18

- Update readme: backend image is published to GHCR, not DockerHub ([#1558](https://github.com/ScilifelabDataCentre/dds_web/pull/1558))
- Workflow bug fixed: PDFs (Technical Overview and Troubleshooting) were downloaded to incorrect directory([#1559](https://github.com/ScilifelabDataCentre/dds_web/pull/1559))

0 comments on commit 08c4954

Please sign in to comment.