From df8a5920909fca3113fab3a38a1b0fb1d039fa1c Mon Sep 17 00:00:00 2001 From: Evolucivebot Date: Tue, 8 Feb 2022 16:32:32 +0000 Subject: [PATCH] EvoluciveBOT has applied migrate_to_ecr This is an automated task. Please consider this while reiviewing this pull request. BEFORE REVIEW READ THIS FIRST: [migrate_to_ecr](https://github.com/olxbr/evolucivebot/tree/main/src/roles/migrate_to_ecr/README.md) > The complete description of what we are doing on this pull request, > and the motivation behind it can be found at: > [migrate_to_ecr](https://github.com/olxbr/evolucivebot/tree/main/src/roles/migrate_to_ecr/README.md) --- .github/workflows/main.yaml | 6 +++--- .github/workflows/release.yaml | 4 ++-- Makefile | 29 ++++++++++++++++++++--------- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index c0e951c..15cee2a 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -38,7 +38,7 @@ jobs: make docker_build make docker_test mkdir -p ~/docker-cache-final-image - docker save -o ~/docker-cache-final-image/aegir.tar vivareal/aegir + docker save -o ~/docker-cache-final-image/aegir.tar ${{ secrets.CONTAINER_REGISTRY_HOST }}//aegir - name: Save docker cache final image uses: actions/cache@v2 @@ -79,5 +79,5 @@ jobs: - name: tag publish docker image if: github.event_name == 'push' && github.ref == 'refs/heads/master' run: | - docker tag vivareal/aegir:build vivareal/aegir:master - docker push vivareal/aegir:master + docker tag ${{ secrets.CONTAINER_REGISTRY_HOST }}//aegir:build ${{ secrets.CONTAINER_REGISTRY_HOST }}//aegir:master + docker push ${{ secrets.CONTAINER_REGISTRY_HOST }}//aegir:master diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b02bb20..5c530de 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -34,5 +34,5 @@ jobs: - name: tag docker image if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') run: | - docker tag vivareal/aegir:build vivareal/aegir:${{ steps.release-name.outputs.release }} - docker push vivareal/aegir:${{ steps.release-name.outputs.release }} + docker tag ${{ secrets.CONTAINER_REGISTRY_HOST }}//aegir:build ${{ secrets.CONTAINER_REGISTRY_HOST }}//aegir:${{ steps.release-name.outputs.release }} + docker push ${{ secrets.CONTAINER_REGISTRY_HOST }}//aegir:${{ steps.release-name.outputs.release }} diff --git a/Makefile b/Makefile index 843e77b..99fd66b 100644 --- a/Makefile +++ b/Makefile @@ -18,9 +18,20 @@ build: generate build/dynamic: generate go build -v +.install-aws-olx: +ifeq (, $(shell which aws-olx)) + $(error "No aws-olx in $(PATH), installing...") + git clone git@github.com:olxbr/devtools-scripts.git /tmp/devtools-scripts + cd /tmp/devtools-scripts/aws-olx + make setup + cd - + +setup-aws-olx: .install-aws-olx + aws-olx cross-dev + docker_clean: -rm -v aegir - -docker rmi -f vivareal/aegir + -docker rmi -f 073521391622.dkr.ecr.us-east-1.amazonaws.com/aegir deploy: kubectl sed -i "s//${GIT_REVISION}/g" deploy/deployment.yaml @@ -29,17 +40,17 @@ deploy: kubectl ./kubectl rollout status deploy/aegir || ./kubectl rollout undo deploy/aegir docker_build: - docker build --target builder -t vivareal/aegir:${GIT_REVISION}-build . - docker build --target dry-app -t vivareal/aegir:${GIT_REVISION} . + docker build --target builder -t 073521391622.dkr.ecr.us-east-1.amazonaws.com/aegir:${GIT_REVISION}-build . + docker build --target dry-app -t 073521391622.dkr.ecr.us-east-1.amazonaws.com/aegir:${GIT_REVISION} . docker_test: - docker run --rm --entrypoint /bin/sh vivareal/aegir:${GIT_REVISION}-build -c "make test" + docker run --rm --entrypoint /bin/sh 073521391622.dkr.ecr.us-east-1.amazonaws.com/aegir:${GIT_REVISION}-build -c "make test" docker_publish: - docker build --target dry-app . -t vivareal/aegir:${GIT_REVISION} - docker tag vivareal/aegir:${GIT_REVISION} vivareal/aegir:latest - docker push vivareal/aegir:${GIT_REVISION} - docker push vivareal/aegir:latest + docker build --target dry-app . -t 073521391622.dkr.ecr.us-east-1.amazonaws.com/aegir:${GIT_REVISION} + docker tag 073521391622.dkr.ecr.us-east-1.amazonaws.com/aegir:${GIT_REVISION} 073521391622.dkr.ecr.us-east-1.amazonaws.com/aegir:latest + docker push 073521391622.dkr.ecr.us-east-1.amazonaws.com/aegir:${GIT_REVISION} + docker push 073521391622.dkr.ecr.us-east-1.amazonaws.com/aegir:latest deps: -mkdir tools @@ -60,7 +71,7 @@ lint_kube_manifests: .ONESHELL: smoke_test: deps lint_kube_manifests @mkdir tmp-tls ; ./genkey.sh tmp-tls ${AEGIR_SVC_NAME} - ./tools/kind create cluster && ./tools/kind load docker-image vivareal/aegir:${GIT_REVISION} + ./tools/kind create cluster && ./tools/kind load docker-image 073521391622.dkr.ecr.us-east-1.amazonaws.com/aegir:${GIT_REVISION} ./tools/kubectl create configmap --from-file etc/rules.yaml aegir-rules ./tools/kubectl create secret tls aegir-tls --cert tmp-tls/webhook-server-tls.crt --key tmp-tls/webhook-server-tls.key sed -e "s/__REPO_IMAGE_TAG__/vivareal\/aegir\:${GIT_REVISION}/" -e "s/imagePullPolicy\:\ Always/imagePullPolicy\:\ Never/" kube-manifests/aegir.yaml | ./tools/kubectl apply -f -