diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 210ad8f..7b04f74 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/.github/workflows/pr-verification.yml b/.github/workflows/pr-verification.yml index d09aa21..105653b 100644 --- a/.github/workflows/pr-verification.yml +++ b/.github/workflows/pr-verification.yml @@ -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" diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 294fa7a..0000000 --- a/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM node:lts-bullseye -RUN npm install -g fsh-sushi@3.3.3 - -RUN apt-get update && apt-get -y install openjdk-17-jdk-headless ruby-full build-essential zlib1g-dev -RUN gem install jekyll bundler diff --git a/README.md b/README.md index 5913e63..d365804 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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 ``` @@ -83,10 +83,12 @@ npm install -g fsh-sushi@3.3.3 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. diff --git a/_gencontinuous.sh b/_gencontinuous.sh old mode 100644 new mode 100755 diff --git a/docker-compose.yml b/docker-compose.yml index c62f100..598e90e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,6 @@ version: '3.7' services: runner: - build: - context: . - dockerfile: Dockerfile + image: hl7fhir/ig-publisher-base:latest volumes: - - ./:/workdir \ No newline at end of file + - ./:/home/publisher/ig \ No newline at end of file