From bae745ea13b926ad35b6c2f9ac49e4904fa1b46f Mon Sep 17 00:00:00 2001 From: WoozyMasta Date: Wed, 15 Dec 2021 11:10:20 +0300 Subject: [PATCH] build: 4.9.1-0.6 --- README.md | 27 ++++++++++++++------------- action.yml | 4 ++-- entrypoint.sh | 3 +++ 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 971c003..655ec6f 100644 --- a/README.md +++ b/README.md @@ -38,9 +38,9 @@ You can check the operation of the container using the [example][] You can pull image from registries: -* `ghcr.io/woozymasta/archimate-ci:4.9.1-0.5` -* `quay.io/woozymasta/archimate-ci:4.9.1-0.5` -* `docker.io/woozymasta/archimate-ci:4.9.1-0.5` +* `ghcr.io/woozymasta/archimate-ci:4.9.1-0.6` +* `quay.io/woozymasta/archimate-ci:4.9.1-0.6` +* `docker.io/woozymasta/archimate-ci:4.9.1-0.6` ## Run Container @@ -57,7 +57,7 @@ docker run --rm -ti \ -e ARCHI_JASPER_REPORT_ENABLED=false \ -e ARCHI_CSV_REPORT_ENABLED=true \ -e ARCHI_EXPORT_MODEL_ENABLED=true \ - ghcr.io/woozymasta/archimate-ci:4.9.1-0.5 + ghcr.io/woozymasta/archimate-ci:4.9.1-0.6 ``` An example with handling a local repository: @@ -70,13 +70,13 @@ chmod o+rw ./report docker run --rm -ti \ -v $(pwd):/archi/project \ -v $(pwd)/report:/archi/report \ - ghcr.io/woozymasta/archimate-ci:4.9.1-0.5 + ghcr.io/woozymasta/archimate-ci:4.9.1-0.6 ``` Working with the CLI directly: ```bash -docker run --rm -ti ghcr.io/woozymasta/archimate-ci:4.9.1-0.5 --help +docker run --rm -ti ghcr.io/woozymasta/archimate-ci:4.9.1-0.6 --help ``` ## Configuration @@ -128,7 +128,7 @@ Options for managing model export: All inputs equivalent to environment variables: -* `githubToken` +* `githubToken` **required** * `archiHtmlReportEnabled` * `archiJasperReportEnabled` * `archiJasperReportFormats` @@ -156,13 +156,14 @@ jobs: - name: Deploy Archi report id: archi - uses: WoozyMasta/archimate-ci-image@4.9.1-0.5 + uses: WoozyMasta/archimate-ci-image@4.9.1-0.6 with: archiHtmlReportEnabled: true archiJasperReportEnabled: true archiJasperReportFormats: PDF,DOCX archiCsvReportEnabled: false archiExportModelEnabled: true + githubToken: ${{ secrets.GITHUB_TOKEN }} ``` ## GitLab CI Example @@ -171,7 +172,7 @@ jobs: pages: stage: build image: - name: woozymasta/archimate-ci-image:4.9.1-0.5 + name: woozymasta/archimate-ci-image:4.9.1-0.6 script: - /opt/Archi/docker-entrypoint.sh @@ -202,8 +203,8 @@ pages: ```bash docker build \ - --tag archimate-ci:4.9.1-0.5 \ - --build-arg="ARCHI_VERSION=4.9.1-0.5" \ + --tag archimate-ci:4.9.1-0.6 \ + --build-arg="ARCHI_VERSION=4.9.1-0.6" \ --build-arg="COARCHI_VERSION=0.8.1.202112061132" \ ./ ``` @@ -226,7 +227,7 @@ podman run --rm -ti \ -v $(pwd)/report:/archi/report \ -e GIT_REPOSITORY=https://github.com/WoozyMasta/archimate-ci-image-example.git \ -e ARCHI_JASPER_REPORT_ENABLED=false \ - ghcr.io/woozymasta/archimate-ci:4.9.1-0.5 + ghcr.io/woozymasta/archimate-ci:4.9.1-0.6 ``` --- @@ -241,7 +242,7 @@ docker run --rm -ti \ -e GIT_REPOSITORY=https://github.com/WoozyMasta/archimate-ci-image-example.git --network=host --add-host="$(getent hosts gitlab.internal.tld | awk '{print $2 ":" $1}')" - ghcr.io/woozymasta/archimate-ci:4.9.1-0.5 + ghcr.io/woozymasta/archimate-ci:4.9.1-0.6 ``` diff --git a/action.yml b/action.yml index 2b4c155..b9639b9 100644 --- a/action.yml +++ b/action.yml @@ -6,7 +6,7 @@ branding: color: blue runs: using: docker - image: docker://ghcr.io/woozymasta/archimate-ci-image:4.9.1-0.5 + image: docker://ghcr.io/woozymasta/archimate-ci-image:4.9.1-0.6 env: GITHUB_TOKEN: ${{ inputs.githubToken }} ARCHI_HTML_REPORT_ENABLED: ${{ inputs.archiHtmlReportEnabled }} @@ -24,7 +24,7 @@ runs: inputs: githubToken: description: GitHub token for accessing the git repository - required: false + required: true archiHtmlReportEnabled: description: Generate HTML report required: false diff --git a/entrypoint.sh b/entrypoint.sh index e94a64d..9baa47a 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -157,6 +157,9 @@ fi if [ "${GITHUB_ACTIONS:-}" == true ]; then echo "Run Archi report generation in GitHub actions" + ls -la + pwd + # Prepare vars : "${GITHUB_REPOSITORY:?Repository name not set}" GITHUB_TOKEN="$(urlencode "${GITHUB_TOKEN:?Token not specified}")"