Skip to content

Commit

Permalink
Merge pull request #180 from fhir-fi/build_updates
Browse files Browse the repository at this point in the history
Build updates 👷
  • Loading branch information
mikajylha authored Jan 9, 2024
2 parents edc60b1 + 82ff388 commit d78b2b2
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup IG publisher
run: docker-compose run runner bash -c "cd /workdir && chmod +x ./_updatePublisher.sh && ./_updatePublisher.sh --yes"
run: docker compose run runner bash -c "./_updatePublisher.sh --yes"
- name: Generate
run: docker-compose run runner bash -c "cd /workdir && chmod +x ./_genonce.sh && ./_genonce.sh"
run: docker compose run runner bash -c "./_genonce.sh"
- name: Setup Pages
uses: actions/configure-pages@v2
- name: Upload artifact
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-verification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Run sushi
run: docker-compose run runner bash -c "cd /workdir && sushi"
run: docker compose run runner bash -c "sushi"
5 changes: 0 additions & 5 deletions Dockerfile

This file was deleted.

14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ See also the repo for

### Required Tools
* NodeJS 18
* Java 17
* Java 21
* Jekyll (ruby)

Or you can use Docker, see [Dockerfile](Dockerfile).
Or you can use Docker, see [compose file](docker-compose.yml).

### Quick Start

Expand All @@ -66,14 +66,14 @@ With the above requirements installed locally, run
#### On OSX, Linux, or Unix

``` bash
npm install -g fsh-sushi@3.3.3
npm install -g fsh-sushi
./_updatePublisher.sh --yes
./_genonce.sh
```

#### On Windows
```
npm install -g fsh-sushi@3.3.3
npm install -g fsh-sushi
.\_updatePublisher.bat --yes
.\_genonce.bat
```
Expand All @@ -83,10 +83,12 @@ npm install -g [email protected]
Run

``` bash
docker-compose run runner bash -c "cd /workdir && ./_updatePublisher.sh --yes"
docker-compose run runner bash -c "cd /workdir && ./_genonce.sh"
docker compose run runner bash -c "./_updatePublisher.sh --yes"
docker compose run runner bash -c "./_genonce.sh"
```

> Switched to hl7fhir/ig-publisher-base image, remove temporary files in your working copy when switching from older image.
#### Results

The implementation guide will be generated to the `output/` directory.
Empty file modified _gencontinuous.sh
100644 → 100755
Empty file.
6 changes: 2 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
version: '3.7'
services:
runner:
build:
context: .
dockerfile: Dockerfile
image: hl7fhir/ig-publisher-base:latest
volumes:
- ./:/workdir
- ./:/home/publisher/ig

0 comments on commit d78b2b2

Please sign in to comment.