Skip to content

Commit

Permalink
build: 4.9.1-1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
WoozyMasta committed Dec 19, 2021
1 parent 3499320 commit 9e2f4a7
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 14 deletions.
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Changelog

Versioning comes in the form of a double tag, where the first version is the
[Archi][] version, and the second version is the version of the container
itself. For example `4.9.1-1.0.1`

## [Unreleased]

## [4.9.1-1.0.1] - 2021-12-20

### Added <!-- markdownlint-disable no-duplicate-header -->

* Added improved support for GitLab CI

## [4.9.1-1.0] - 2021-12-15

### Added <!-- markdownlint-disable no-duplicate-header -->

* Release of the first finished and working version 🥳

<!-- Links -->
[Archi]: https://github.com/archimatetool/archi "Archi: ArchiMate Modelling Tool"
<!-- Version compare links -->
[Unreleased]: https://github.com/WoozyMasta/archimate-ci-image/compare/4.9.1-1.0.1...HEAD
[4.9.1-1.0.1]: https://github.com/WoozyMasta/archimate-ci-image/compare/4.9.1-1.0...4.9.1-1.0.1
[4.9.1-1.0]: https://github.com/WoozyMasta/archimate-ci-image/tree/4.9.1-1.0
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ for cloning.

You can pull image from registries:

* `ghcr.io/woozymasta/archimate-ci:4.9.1-1.0`
* `quay.io/woozymasta/archimate-ci:4.9.1-1.0`
* `docker.io/woozymasta/archimate-ci:4.9.1-1.0`
* `ghcr.io/woozymasta/archimate-ci:4.9.1-1.0.1`
* `quay.io/woozymasta/archimate-ci:4.9.1-1.0.1`
* `docker.io/woozymasta/archimate-ci:4.9.1-1.0.1`

## Run Container

Expand All @@ -62,7 +62,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-1.0
ghcr.io/woozymasta/archimate-ci:4.9.1-1.0.1
```

An example with handling a local repository:
Expand All @@ -75,13 +75,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-1.0
ghcr.io/woozymasta/archimate-ci:4.9.1-1.0.1
```

Working with the CLI directly:

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

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

- name: Deploy Archi report
id: archi
uses: WoozyMasta/[email protected]
uses: WoozyMasta/[email protected].1
with:
archiHtmlReportEnabled: true
archiJasperReportEnabled: true
Expand All @@ -187,7 +187,7 @@ Add a configuration like this to your `./.gitlab-ci.yml` file:
pages:
stage: build
image:
name: woozymasta/archimate-ci-image:4.9.1-1.0
name: woozymasta/archimate-ci-image:4.9.1-1.0.1
entrypoint: [""]
script:
Expand Down Expand Up @@ -219,8 +219,8 @@ and all report paths are automatically set to `$CI_PROJECT_DIR/public`

```bash
docker build \
--tag archimate-ci:4.9.1-1.0 \
--build-arg="ARCHI_VERSION=4.9.1-1.0" \
--tag archimate-ci:4.9.1-1.0.1 \
--build-arg="ARCHI_VERSION=4.9.1-1.0.1" \
--build-arg="COARCHI_VERSION=0.8.1.202112061132" \
./
```
Expand All @@ -243,7 +243,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-1.0
ghcr.io/woozymasta/archimate-ci:4.9.1-1.0.1
```

---
Expand All @@ -258,13 +258,13 @@ 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-1.0
ghcr.io/woozymasta/archimate-ci:4.9.1-1.0.1
```

<!-- links -->

[Archi]: https://www.archimatetool.com "The Open Source modelling toolkit for creating ArchiMate models and sketches."
[Archi repository]: https://github.com/archimatetool/archi "Archi: ArchiMate Modelling Tool "
[Archi repository]: https://github.com/archimatetool/archi "Archi: ArchiMate Modelling Tool"
[coArchi]: https://github.com/archimatetool/archi-modelrepository-plugin "coArchi – Model Collaboration for Archi"

[example-gh]: https://github.com/WoozyMasta/archimate-ci-image-example.git
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-1.0
image: docker://ghcr.io/woozymasta/archimate-ci-image:4.9.1-1.0.1
env:
GITHUB_TOKEN: ${{ inputs.githubToken }}
ARCHI_HTML_REPORT_ENABLED: ${{ inputs.archiHtmlReportEnabled }}
Expand Down

0 comments on commit 9e2f4a7

Please sign in to comment.