pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1068 from dod-ccpo/docker-multi-tag

Browse Source 
Docker multi tag
This commit is contained in:
dandds
2019-09-13 09:40:37 -04:00
committed by GitHub
parent e565913f48 78948797a8
commit 608893a6b3
5 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
.circleci/config.yml
View File

@@ -1,9 +1,9 @@
version: 2.1 version: 2.1
orbs: orbs:
aws-ecr: circleci/aws-ecr@4.0.1 aws-ecr: circleci/aws-ecr@6.3.0
aws-eks: circleci/aws-eks@0.1.0 aws-eks: circleci/aws-eks@0.1.0
azure-acr: circleci/azure-acr@0.1.1 azure-acr: circleci/azure-acr@0.1.2
azure-aks: circleci/azure-aks@0.2.0 azure-aks: circleci/azure-aks@0.2.0
kubernetes: circleci/kubernetes@0.3.0 kubernetes: circleci/kubernetes@0.3.0
@@ -102,7 +102,7 @@ jobs:
executor: aws-eks/python3 executor: aws-eks/python3
steps: steps:
- migration_setup: - migration_setup:
container_image: "$AWS_ECR_ACCOUNT_URL/atat:$CIRCLE_SHA1" container_image: "$AWS_ECR_ACCOUNT_URL/atat:atat-$CIRCLE_SHA1"
- aws-eks/update-kubeconfig-with-authenticator: - aws-eks/update-kubeconfig-with-authenticator:
cluster-name: atat cluster-name: atat
aws-region: "${AWS_REGION}" aws-region: "${AWS_REGION}"
@@ -112,7 +112,7 @@ jobs:
executor: azure-aks/default executor: azure-aks/default
steps: steps:
- migration_setup: - migration_setup:
container_image: "$AZURE_SERVER_NAME/atat:$CIRCLE_SHA1" container_image: "$AZURE_SERVER_NAME/atat:atat-$CIRCLE_SHA1"
- azure-aks/update-kubeconfig-with-credentials: - azure-aks/update-kubeconfig-with-credentials:
cluster-name: atat-cluster cluster-name: atat-cluster
install-kubectl: true install-kubectl: true
@@ -120,6 +120,21 @@ jobs:
resource-group: atat resource-group: atat
- migration_apply - migration_apply
# the azure-acr orb doesn't allow for multiple tags in the
# build-and-push-image step, so instead we wrap our own job around it and run
# some additional Docker commands
azure-build-and-push-image:
executor: azure-acr/default
steps:
- azure-acr/build-and-push-image:
extra-build-args: "--build-arg CSP=azure"
login-server-name: "${AZURE_SERVER_NAME}"
registry-name: pwatat
repo: atat
tag: "atat-${CIRCLE_SHA1}"
- run: "docker tag ${AZURE_SERVER_NAME}/atat:atat-${CIRCLE_SHA1} ${AZURE_SERVER_NAME}/atat:latest"
- run: "docker push ${AZURE_SERVER_NAME}/atat:latest"
workflows: workflows:
version: 2 version: 2
run-tests: run-tests:
@@ -128,12 +143,7 @@ workflows:
- test: - test:
requires: requires:
- app_setup - app_setup
- azure-acr/build_and_push_image: - azure-build-and-push-image:
extra-build-args: "--build-arg CSP=azure"
login-server-name: "${AZURE_SERVER_NAME}"
registry-name: pwatat
repo: atat
tag: "${CIRCLE_SHA1}"
requires: requires:
- test - test
filters: filters:
@@ -142,14 +152,14 @@ workflows:
- master - master
- azure-migration: - azure-migration:
requires: requires:
- azure-acr/build_and_push_image - azure-build-and-push-image
filters: filters:
branches: branches:
only: only:
- master - master
- azure-aks/update-container-image: - azure-aks/update-container-image:
cluster-name: atat-cluster cluster-name: atat-cluster
container-image-updates: "atst=${AZURE_SERVER_NAME}/atat:${CIRCLE_SHA1}" container-image-updates: "atst=${AZURE_SERVER_NAME}/atat:atat-${CIRCLE_SHA1}"
namespace: atat namespace: atat
resource-name: deployment.apps/atst resource-name: deployment.apps/atst
resource-group: atat resource-group: atat
@@ -163,7 +173,7 @@ workflows:
- master - master
- azure-aks/update-container-image: - azure-aks/update-container-image:
cluster-name: atat-cluster cluster-name: atat-cluster
container-image-updates: "atst-worker=${AZURE_SERVER_NAME}/atat:${CIRCLE_SHA1}" container-image-updates: "atst-worker=${AZURE_SERVER_NAME}/atat:atat-${CIRCLE_SHA1}"
namespace: atat namespace: atat
resource-name: deployment.apps/atst-worker resource-name: deployment.apps/atst-worker
resource-group: atat resource-group: atat
@@ -175,10 +185,10 @@ workflows:
branches: branches:
only: only:
- master - master
- aws-ecr/build_and_push_image: - aws-ecr/build-and-push-image:
extra-build-args: "--build-arg CSP=aws" extra-build-args: "--build-arg CSP=aws"
repo: atat repo: atat
tag: "${CIRCLE_SHA1}" tag: "atat-${CIRCLE_SHA1},latest"
requires: requires:
- test - test
filters: filters:
@@ -187,14 +197,14 @@ workflows:
- master - master
- aws-migration: - aws-migration:
requires: requires:
- aws-ecr/build_and_push_image - aws-ecr/build-and-push-image
filters: filters:
branches: branches:
only: only:
- master - master
- aws-eks/update-container-image: - aws-eks/update-container-image:
cluster-name: atat cluster-name: atat
container-image-updates: "atst=${AWS_ECR_ACCOUNT_URL}/atat:${CIRCLE_SHA1}" container-image-updates: "atst=${AWS_ECR_ACCOUNT_URL}/atat:atat-${CIRCLE_SHA1}"
namespace: atat namespace: atat
resource-name: deployment.apps/atst resource-name: deployment.apps/atst
aws-region: "${AWS_REGION}" aws-region: "${AWS_REGION}"
@@ -208,7 +218,7 @@ workflows:
- master - master
- aws-eks/update-container-image: - aws-eks/update-container-image:
cluster-name: atat cluster-name: atat
container-image-updates: "atst-worker=${AWS_ECR_ACCOUNT_URL}/atat:${CIRCLE_SHA1}" container-image-updates: "atst-worker=${AWS_ECR_ACCOUNT_URL}/atat:atat-${CIRCLE_SHA1}"
namespace: atat namespace: atat
resource-name: deployment.apps/atst-worker resource-name: deployment.apps/atst-worker
aws-region: "${AWS_REGION}" aws-region: "${AWS_REGION}"

4
deploy/aws/aws.yml
View File

@@ -28,7 +28,7 @@ spec:
fsGroup: 101 fsGroup: 101
containers: containers:
- name: atst - name: atst
image: 904153757533.dkr.ecr.us-east-2.amazonaws.com/atat:4d14326ba77f1b3287b3c436a2d9be064bf4fba3 image: 904153757533.dkr.ecr.us-east-2.amazonaws.com/atat:latest
resources: resources:
requests: requests:
memory: "500Mi" memory: "500Mi"
@@ -139,7 +139,7 @@ spec:
fsGroup: 101 fsGroup: 101
containers: containers:
- name: atst-worker - name: atst-worker
image: 904153757533.dkr.ecr.us-east-2.amazonaws.com/atat:4d14326ba77f1b3287b3c436a2d9be064bf4fba3 image: 904153757533.dkr.ecr.us-east-2.amazonaws.com/atat:latest
args: [ args: [
"/opt/atat/atst/.venv/bin/python", "/opt/atat/atst/.venv/bin/python",
"/opt/atat/atst/.venv/bin/celery", "/opt/atat/atst/.venv/bin/celery",

2
deploy/aws/crls-sync.yaml
View File

@@ -12,7 +12,7 @@ spec:
restartPolicy: OnFailure restartPolicy: OnFailure
containers: containers:
- name: crls - name: crls
image: 904153757533.dkr.ecr.us-east-2.amazonaws.com/atat:8f1c8b5633ca70168837c885010e7d66d93562dc image: 904153757533.dkr.ecr.us-east-2.amazonaws.com/atat:latest
command: [ command: [
"/bin/sh", "-c" "/bin/sh", "-c"
] ]

4
deploy/azure/azure.yml
View File

@@ -28,7 +28,7 @@ spec:
fsGroup: 101 fsGroup: 101
containers: containers:
- name: atst - name: atst
image: pwatat.azurecr.io/atat:4d14326ba77f1b3287b3c436a2d9be064bf4fba3 image: pwatat.azurecr.io/atat:latest
resources: resources:
requests: requests:
memory: "500Mi" memory: "500Mi"
@@ -140,7 +140,7 @@ spec:
fsGroup: 101 fsGroup: 101
containers: containers:
- name: atst-worker - name: atst-worker
image: pwatat.azurecr.io/atat:4d14326ba77f1b3287b3c436a2d9be064bf4fba3 image: pwatat.azurecr.io/atat:latest
args: [ args: [
"/opt/atat/atst/.venv/bin/python", "/opt/atat/atst/.venv/bin/python",
"/opt/atat/atst/.venv/bin/celery", "/opt/atat/atst/.venv/bin/celery",

2
deploy/azure/crls-sync.yaml
View File

@@ -12,7 +12,7 @@ spec:
restartPolicy: OnFailure restartPolicy: OnFailure
containers: containers:
- name: crls - name: crls
image: pwatat.azurecr.io/atat:8f1c8b5633ca70168837c885010e7d66d93562dc image: pwatat.azurecr.io/atat:latest
command: [ command: [
"/bin/sh", "-c" "/bin/sh", "-c"
] ]