From 56be9df55b1fefa750d4f116c59586cac1cd98cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=20Jylh=C3=A4?= Date: Tue, 9 Jan 2024 09:18:41 +0200 Subject: [PATCH 1/4] Use ig builder image from docker hub --- docker-compose.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c62f100..a73e156 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 From e0c9a8c33fd53c68e75d9addd62650976b590c55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=20Jylh=C3=A4?= Date: Tue, 9 Jan 2024 09:20:16 +0200 Subject: [PATCH 2/4] Update readme's docker commands docker-compose is now included in docker installations. Command is a bit different. This might break old docker workstation installations, but those installations should be upgrade anyways. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5913e63..c0034fd 100644 --- a/README.md +++ b/README.md @@ -83,8 +83,8 @@ 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 "cd /workdir && ./_updatePublisher.sh --yes" +docker compose run runner bash -c "cd /workdir && ./_genonce.sh" ``` #### Results From a0515688de9075e30553c1e08a707c11335432a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=20Jylh=C3=A4?= Date: Tue, 9 Jan 2024 09:42:46 +0200 Subject: [PATCH 3/4] Switch to ig-publisher-base image Seems like almost everyone is using this image. Most notably auto-ig-builder. Update instructions to use the latest version of sushi too. We dont have fine grained control anymore. --- .github/workflows/build.yml | 4 ++-- .github/workflows/pr-verification.yml | 2 +- Dockerfile | 5 ----- README.md | 14 ++++++++------ _gencontinuous.sh | 0 docker-compose.yml | 2 +- 6 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 Dockerfile mode change 100644 => 100755 _gencontinuous.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 210ad8f..87e0f06 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 "chmod +x ./_updatePublisher.sh && ./_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 "chmod +x ./_genonce.sh && ./_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 c0034fd..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 a73e156..598e90e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,4 +3,4 @@ services: runner: image: hl7fhir/ig-publisher-base:latest volumes: - - ./:/workdir \ No newline at end of file + - ./:/home/publisher/ig \ No newline at end of file From b5069cce0c87f135ec472568a78ff2674ede78c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=20Jylh=C3=A4?= Date: Tue, 9 Jan 2024 10:13:29 +0200 Subject: [PATCH 4/4] Remove obsolete chmodding This was due to an old bug in _updatepublisher that has been fixed for a while. --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 87e0f06..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 "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 "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