Skip to content

Commit 88b8638

Browse files
authored
Merge pull request #6 from metno/5-update-written-docs-in-readme
5 update written docs in readme
2 parents 089a3c2 + c283fac commit 88b8638

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,21 @@ The application is meant to be run as containers. Each component has an associat
2121
### Build
2222

2323
For all components, except fortiup, a docker image is built and pushed on every commit.
24-
They will all get the same tag, corresponding to `$CI_PIPELINE_ID`, which identifies a single run of a gitlab ci pipeline.
24+
They will all get the same tag, corresponding to the GitHub Actions `run_id`, which identifies a single workflow run.
2525

2626
For example, you may end up with the following images in the registry.
2727

2828
- fortiregistry.azurecr.io/xmlfrontend:337359
29+
- fortiregistry.azurecr.io/moxfrontend:337359
2930
- fortiregistry.azurecr.io/rawdataforecaster:337359
3031
- fortiregistry.azurecr.io/jsonfrontend:337359
3132
- fortiregistry.azurecr.io/correctedforecaster:337359
32-
- fortiregistry.azurecr.io/rawdataforecaster:337359
3333
- fortiregistry.azurecr.io/healthz:337359
3434

35-
In this case the docker tag, 337359, corresponds to the gitlab's pipeline id when building the project.
36-
The pipeline id may be found by looking at the correct build in the [pipelines](https://gitlab.met.no/team-punkt/forti/f2/-/pipelines) page.
35+
In this case the docker tag, 337359, corresponds to the GitHub Actions run ID when building the project.
36+
The run ID may be found by looking at the correct build on the [Actions](https://github.com/metno/forti/actions) page.
37+
38+
For `fortiup`, a binary artifact is built and uploaded (rather than a docker image) when a tag matching `fortiup/*` is pushed.
3739

3840
## Run locally
3941

run_locally.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export AZURE_STORAGE_SAS_TOKEN=$(az storage container generate-sas \
6363
--account-name "$AZURE_STORAGE_ACCOUNT" \
6464
--https-only \
6565
--permissions lr \
66-
--expiry "$(date -d "1 day" +"%Y-%m-%dT00:00Z")" \
66+
--expiry "$(date -d '1 day' +'%Y-%m-%dT00:00Z' 2>/dev/null || date -v+1d +'%Y-%m-%dT00:00Z')" \
6767
-otsv \
6868
)
6969
```
@@ -91,7 +91,7 @@ cd jsonfrontend/cmd/jsonfrontend/
9191
go run main.go
9292
```
9393

94-
This will connect to the `correctedforecaster`. It is possible to bypass that one, and go straight to the `radataforecaster`. To do that, add an extra option when calling the program:
94+
This will connect to the `correctedforecaster`. It is possible to bypass that one, and go straight to the `rawdataforecaster`. To do that, add an extra option when calling the program:
9595

9696
```bash
9797
cd jsonfrontend/cmd/jsonfrontend/

0 commit comments

Comments
 (0)