Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
f3dbdfe562 | |||
ac9914ae16 | |||
da576e2197 |
2
.cz.yaml
2
.cz.yaml
@ -4,5 +4,5 @@ commitizen:
|
|||||||
prerelease_offset: 1
|
prerelease_offset: 1
|
||||||
tag_format: $version
|
tag_format: $version
|
||||||
update_changelog_on_bump: false
|
update_changelog_on_bump: false
|
||||||
version: 0.1.1
|
version: 0.1.2-a1
|
||||||
version_scheme: semver
|
version_scheme: semver
|
||||||
|
@ -151,36 +151,45 @@ Github (Push --mirror):
|
|||||||
- docker login docker.io -u $NFC_DOCKERHUB_USERNAME -p $NFC_DOCKERHUB_TOKEN
|
- docker login docker.io -u $NFC_DOCKERHUB_USERNAME -p $NFC_DOCKERHUB_TOKEN
|
||||||
- docker image ls
|
- docker image ls
|
||||||
- |
|
- |
|
||||||
DOCKER_HUB_TAG=dev
|
# DOCKER_HUB_TAG=dev
|
||||||
|
|
||||||
echo "[DEBUG] default: DOCKER_HUB_TAG=$DOCKER_HUB_TAG";
|
# echo "[DEBUG] default: DOCKER_HUB_TAG=$DOCKER_HUB_TAG";
|
||||||
|
|
||||||
if [ "$CI_COMMIT_BRANCH" == "master" ]; then
|
# if [ "$CI_COMMIT_BRANCH" == "master" ]; then
|
||||||
|
|
||||||
DOCKER_HUB_TAG=latest
|
# DOCKER_HUB_TAG=latest
|
||||||
|
|
||||||
echo "[DEBUG] stable: DOCKER_HUB_TAG=$DOCKER_HUB_TAG";
|
# echo "[DEBUG] stable: DOCKER_HUB_TAG=$DOCKER_HUB_TAG";
|
||||||
|
|
||||||
elif [ "$CI_COMMIT_BRANCH" == "development" ]; then
|
# fi;
|
||||||
|
|
||||||
DOCKER_HUB_TAG=dev
|
# if [ "$CI_COMMIT_BRANCH" == "development" ]; then
|
||||||
|
|
||||||
echo "[DEBUG] dev: DOCKER_HUB_TAG=$DOCKER_HUB_TAG";
|
# DOCKER_HUB_TAG=dev
|
||||||
|
|
||||||
|
# echo "[DEBUG] dev: DOCKER_HUB_TAG=$DOCKER_HUB_TAG";
|
||||||
|
|
||||||
|
# fi;
|
||||||
|
|
||||||
fi;
|
|
||||||
|
|
||||||
echo "[DEBUG] DOCKER_IMAGE_PUBLISH_NAME=$DOCKER_IMAGE_PUBLISH_NAME";
|
echo "[DEBUG] DOCKER_IMAGE_PUBLISH_NAME=$DOCKER_IMAGE_PUBLISH_NAME";
|
||||||
|
|
||||||
echo "[DEBUG] final: DOCKER_HUB_TAG=$DOCKER_HUB_TAG";
|
# echo "[DEBUG] final: DOCKER_HUB_TAG=$DOCKER_HUB_TAG";
|
||||||
|
|
||||||
echo "[DEBUG] DOCKER_MULTI_ARCH_IMAGES=$DOCKER_MULTI_ARCH_IMAGES";
|
echo "[DEBUG] DOCKER_MULTI_ARCH_IMAGES=$DOCKER_MULTI_ARCH_IMAGES";
|
||||||
|
|
||||||
docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:$DOCKER_HUB_TAG;
|
|
||||||
|
|
||||||
if [ "${CI_COMMIT_TAG}" ]; then
|
if [ "${CI_COMMIT_TAG}" ]; then
|
||||||
|
|
||||||
docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:$CI_COMMIT_TAG;
|
docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:$CI_COMMIT_TAG;
|
||||||
|
|
||||||
|
docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:latest;
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:dev;
|
||||||
|
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
after_script:
|
after_script:
|
||||||
|
@ -2,6 +2,12 @@
|
|||||||
|
|
||||||
### Fix
|
### Fix
|
||||||
|
|
||||||
|
- **build**: ensure the correct tags and architectures are published
|
||||||
|
|
||||||
|
## 0.1.1 (2024-02-21)
|
||||||
|
|
||||||
|
### Fix
|
||||||
|
|
||||||
- **ci**: use correct collection name
|
- **ci**: use correct collection name
|
||||||
|
|
||||||
## 0.1.0 (2024-02-21)
|
## 0.1.0 (2024-02-21)
|
||||||
|
@ -32,8 +32,8 @@ This project is hosted on [gitlab](https://gitlab.com/nofusscomputing/projects/a
|
|||||||
|
|
||||||
**Ansible Galaxy**
|
**Ansible Galaxy**
|
||||||
|
|
||||||
[](https://galaxy.ansible.com/ui/repo/published/nofusscomputing/ci_test_collection/)
|
[](https://galaxy.ansible.com/ui/repo/published/nofusscomputing/phpipam_scan_agent/)
|
||||||

|

|
||||||
|
|
||||||
----
|
----
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ namespace: nofusscomputing
|
|||||||
name: phpipam_scan_agent
|
name: phpipam_scan_agent
|
||||||
|
|
||||||
# The version of the collection. Must be compatible with semantic versioning
|
# The version of the collection. Must be compatible with semantic versioning
|
||||||
version: 0.1.1
|
version: 0.1.2-a1
|
||||||
|
|
||||||
# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
|
# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
|
||||||
readme: README.md
|
readme: README.md
|
||||||
|
Reference in New Issue
Block a user