diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dabaa1f..764b08b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ image: dev-harbor-01.smardigo.digital/smardigo/smardigo-ci-ansible services: - name: docker-cache.dev-at.de/docker:19-dind - alias: _docker + alias: docker stages: - ansible-lint @@ -26,8 +26,8 @@ ansible-builder-job: - cd ansible-builder script: - echo "Running ansible-build to build awx execution environment" - - ansible-builder build -v 3 --tag $AWX_EE_DOCKER_IMAGE_EXTERN:latest - - _docker push $AWX_EE_DOCKER_IMAGE_EXTERN:latest + - ansible-builder build -v 3 --tag $AWX_EE_DOCKER_IMAGE_EXTERN:latest ansible-builder build --container-runtime docker + - docker push $AWX_EE_DOCKER_IMAGE_EXTERN:latest only: - master except: diff --git a/README.md b/README.md index 2cd451c..24ce475 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Create/Start servers for stage-dev before every git-merge depending on changes concerning new ansible collections/roles and/or new pip-packages, please run the following: cd ansible-builder/ - ansible-builder build --tag awx-custom-ee:latest --container-runtime docker + ansible-builder build --tag dev-harbor-01.smardigo.digital/awx/awx-custom-ee --container-runtime docker @@ -95,9 +95,6 @@ IPFire 149.233.6.129 - eShelter 212.121.131.106 - Siemensdamm -Prometheus - curl -X POST https://{{ prometheus-url }}/-/reload - Prometheus (Grafana) docker exec -i dev-prometheus-01-grafana sh -c 'grafana-cli plugins install grafana-piechart-panel' docker restart dev-prometheus-01-grafana