Skip to content

Commit

Permalink
build: 4.9.1-0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
WoozyMasta committed Dec 15, 2021
1 parent bae745e commit 79e5bb4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 17 deletions.
24 changes: 12 additions & 12 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.6`
* `quay.io/woozymasta/archimate-ci:4.9.1-0.6`
* `docker.io/woozymasta/archimate-ci:4.9.1-0.6`
* `ghcr.io/woozymasta/archimate-ci:4.9.1-0.7`
* `quay.io/woozymasta/archimate-ci:4.9.1-0.7`
* `docker.io/woozymasta/archimate-ci:4.9.1-0.7`

## 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.6
ghcr.io/woozymasta/archimate-ci:4.9.1-0.7
```

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.6
ghcr.io/woozymasta/archimate-ci:4.9.1-0.7
```

Working with the CLI directly:

```bash
docker run --rm -ti ghcr.io/woozymasta/archimate-ci:4.9.1-0.6 --help
docker run --rm -ti ghcr.io/woozymasta/archimate-ci:4.9.1-0.7 --help
```

## Configuration
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:

- name: Deploy Archi report
id: archi
uses: WoozyMasta/[email protected].6
uses: WoozyMasta/[email protected].7
with:
archiHtmlReportEnabled: true
archiJasperReportEnabled: true
Expand All @@ -172,7 +172,7 @@ jobs:
pages:
stage: build
image:
name: woozymasta/archimate-ci-image:4.9.1-0.6
name: woozymasta/archimate-ci-image:4.9.1-0.7

script:
- /opt/Archi/docker-entrypoint.sh
Expand Down Expand Up @@ -203,8 +203,8 @@ pages:
```bash
docker build \
--tag archimate-ci:4.9.1-0.6 \
--build-arg="ARCHI_VERSION=4.9.1-0.6" \
--tag archimate-ci:4.9.1-0.7 \
--build-arg="ARCHI_VERSION=4.9.1-0.7" \
--build-arg="COARCHI_VERSION=0.8.1.202112061132" \
./
```
Expand All @@ -227,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.6
ghcr.io/woozymasta/archimate-ci:4.9.1-0.7
```

---
Expand All @@ -242,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.6
ghcr.io/woozymasta/archimate-ci:4.9.1-0.7
```

<!-- links -->
Expand Down
2 changes: 1 addition & 1 deletion 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.6
image: docker://ghcr.io/woozymasta/archimate-ci-image:4.9.1-0.7
env:
GITHUB_TOKEN: ${{ inputs.githubToken }}
ARCHI_HTML_REPORT_ENABLED: ${{ inputs.archiHtmlReportEnabled }}
Expand Down
5 changes: 1 addition & 4 deletions entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -euo pipefail
set -exuo pipefail

# Vars
# ----
Expand Down Expand Up @@ -157,9 +157,6 @@ 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 79e5bb4

Please sign in to comment.