Skip to content

Commit

Permalink
build: 4.9.1-0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
WoozyMasta committed Dec 15, 2021
1 parent 72a509e commit bae745e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 15 deletions.
27 changes: 14 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -128,7 +128,7 @@ Options for managing model export:

All inputs equivalent to environment variables:

* `githubToken`
* `githubToken` **required**
* `archiHtmlReportEnabled`
* `archiJasperReportEnabled`
* `archiJasperReportFormats`
Expand Down Expand Up @@ -156,13 +156,14 @@ jobs:

- name: Deploy Archi report
id: archi
uses: WoozyMasta/[email protected].5
uses: WoozyMasta/[email protected].6
with:
archiHtmlReportEnabled: true
archiJasperReportEnabled: true
archiJasperReportFormats: PDF,DOCX
archiCsvReportEnabled: false
archiExportModelEnabled: true
githubToken: ${{ secrets.GITHUB_TOKEN }}
```
## GitLab CI Example
Expand All @@ -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
Expand Down Expand Up @@ -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" \
./
```
Expand All @@ -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
```

---
Expand All @@ -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
```

<!-- links -->
Expand Down
4 changes: 2 additions & 2 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand Down
3 changes: 3 additions & 0 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}")"
Expand Down

0 comments on commit bae745e

Please sign in to comment.