Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
f3dbdfe562 | |||
ac9914ae16 | |||
da576e2197 | |||
9159cbc8ac | |||
5b5f968bdd |
2
.cz.yaml
2
.cz.yaml
@ -4,5 +4,5 @@ commitizen:
|
||||
prerelease_offset: 1
|
||||
tag_format: $version
|
||||
update_changelog_on_bump: false
|
||||
version: 0.1.0
|
||||
version: 0.1.2-a1
|
||||
version_scheme: semver
|
||||
|
@ -1,6 +1,6 @@
|
||||
|
||||
variables:
|
||||
ANSIBLE_GALAXY_PACKAGE_NAME: phpipam_scanagent
|
||||
ANSIBLE_GALAXY_PACKAGE_NAME: phpipam_scan_agent
|
||||
GIT_SYNC_URL: "https://$GITHUB_USERNAME_ROBOT:$GITHUB_TOKEN_ROBOT@github.com/NoFussComputing/ansible_collection_phpipam_scan_agent.git"
|
||||
# GIT_SUBMODULE_PATHS: gitlab-ci
|
||||
GIT_SUBMODULE_DEPTH: 1
|
||||
@ -136,51 +136,60 @@ Github (Push --mirror):
|
||||
|
||||
docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD;
|
||||
|
||||
for i in ${DOCKER_IMAGE_BUILD_TARGET_PLATFORMS//,/ }
|
||||
do
|
||||
# for i in ${DOCKER_IMAGE_BUILD_TARGET_PLATFORMS//,/ }
|
||||
# do
|
||||
|
||||
docker buildx imagetools inspect $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
|
||||
docker buildx imagetools inspect $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
|
||||
|
||||
DOCKER_MULTI_ARCH_IMAGES=$(docker buildx imagetools inspect "$DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG" --format "{{ range .Manifest.Manifests }}$DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG@{{ println .Digest }} {{end}}")
|
||||
DOCKER_MULTI_ARCH_IMAGES=$(docker buildx imagetools inspect "$DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG" --format "{{ range .Manifest.Manifests }}$DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG@{{ println .Digest }} {{end}}")
|
||||
|
||||
echo "[DEBUG] DOCKER_MULTI_ARCH_IMAGES=$DOCKER_MULTI_ARCH_IMAGES";
|
||||
echo "[DEBUG] DOCKER_MULTI_ARCH_IMAGES=$DOCKER_MULTI_ARCH_IMAGES";
|
||||
|
||||
done;
|
||||
# done;
|
||||
|
||||
script:
|
||||
- docker login docker.io -u $NFC_DOCKERHUB_USERNAME -p $NFC_DOCKERHUB_TOKEN
|
||||
- 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] 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";
|
||||
|
||||
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
|
||||
|
||||
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;
|
||||
|
||||
after_script:
|
||||
|
14
CHANGELOG.md
14
CHANGELOG.md
@ -1,10 +1,21 @@
|
||||
## Unreleased
|
||||
|
||||
### Fix
|
||||
|
||||
- **build**: ensure the correct tags and architectures are published
|
||||
|
||||
## 0.1.1 (2024-02-21)
|
||||
|
||||
### Fix
|
||||
|
||||
- **ci**: use correct collection name
|
||||
|
||||
## 0.1.0 (2024-02-21)
|
||||
|
||||
### Feat
|
||||
|
||||
- **docker**: adjust scanner job to run every 5 mins
|
||||
- **docs**: add initial doc layout and CI jobs
|
||||
- **docker**: container that launches server and scanner in one
|
||||
|
||||
### Fix
|
||||
|
||||
@ -13,4 +24,3 @@
|
||||
- **ci**: ensure docker build and publish occurs
|
||||
- Don't process results if scan report is empty
|
||||
- **docs**: correct nav link
|
||||
- add missing collection dep 'ansible.utils'
|
||||
|
@ -32,8 +32,8 @@ This project is hosted on [gitlab](https://gitlab.com/nofusscomputing/projects/a
|
||||
|
||||
**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
|
||||
|
||||
# The version of the collection. Must be compatible with semantic versioning
|
||||
version: 0.1.0
|
||||
version: 0.1.2-a1
|
||||
|
||||
# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
|
||||
readme: README.md
|
||||
|
Reference in New Issue
Block a user