Skip to content
This repository has been archived by the owner on May 23, 2023. It is now read-only.

EvoluciveBOT has applied migrate_to_ecr #15

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

EvoluciveBOT has applied migrate_to_ecr #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}/<PUT_THE_BU_AND_TEAM_NAME_HERE>/aegir

- name: Save docker cache final image
uses: actions/cache@v2
Expand Down Expand Up @@ -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 }}/<PUT_THE_BU_AND_TEAM_NAME_HERE>/aegir:build ${{ secrets.CONTAINER_REGISTRY_HOST }}/<PUT_THE_BU_AND_TEAM_NAME_HERE>/aegir:master
docker push ${{ secrets.CONTAINER_REGISTRY_HOST }}/<PUT_THE_BU_AND_TEAM_NAME_HERE>/aegir:master
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}/<PUT_THE_BU_AND_TEAM_NAME_HERE>/aegir:build ${{ secrets.CONTAINER_REGISTRY_HOST }}/<PUT_THE_BU_AND_TEAM_NAME_HERE>/aegir:${{ steps.release-name.outputs.release }}
docker push ${{ secrets.CONTAINER_REGISTRY_HOST }}/<PUT_THE_BU_AND_TEAM_NAME_HERE>/aegir:${{ steps.release-name.outputs.release }}
29 changes: 20 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]: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/<IMAGE-TAG>/${GIT_REVISION}/g" deploy/deployment.yaml
Expand All @@ -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
Expand All @@ -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 -
Expand Down