Skip to content

Commit a6b55f9

Browse files
authored
Merge pull request #51 from plotly/deploy-from-quay
Deploy from Quay
2 parents f773ef3 + 148c91d commit a6b55f9

File tree

4 files changed

+8
-26
lines changed

4 files changed

+8
-26
lines changed

.circleci/config.yml

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ jobs:
8282
- run:
8383
name: Build Docker image
8484
command: |
85-
docker build -f deployment/Dockerfile -t gcr.io/${GOOGLE_PROJECT_ID}/imageserver:$CIRCLE_SHA1 .
85+
docker build -f deployment/Dockerfile -t quay.io/plotly/image-exporter:$CIRCLE_SHA1 .
8686
8787
- run:
8888
name: Smoke test Docker image
8989
command: |
90-
docker run -d -p 9091:9091/tcp --name imageserver gcr.io/${GOOGLE_PROJECT_ID}/imageserver:$CIRCLE_SHA1
90+
docker run -d -p 9091:9091/tcp --name imageserver quay.io/plotly/image-exporter:$CIRCLE_SHA1
9191
docker run --network container:imageserver quay.io/plotly/wget wget --retry-connrefused --waitretry=1 -t 60 -O /dev/null --progress=dot http://localhost:9091/ping
9292
9393
@@ -99,28 +99,10 @@ jobs:
9999
- setup_remote_docker:
100100
reusable: true
101101

102-
- run:
103-
name: Install gcloud
104-
command: |
105-
echo "deb http://packages.cloud.google.com/apt cloud-sdk-jessie main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
106-
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
107-
sudo apt-get update && sudo apt-get install google-cloud-sdk kubectl
108-
109-
- run:
110-
name: Push Docker image to GCR
111-
command: |
112-
echo ${GOOGLE_AUTH} | base64 -i --decode > ${HOME}/gcp-key.json
113-
gcloud auth activate-service-account --key-file ${HOME}/gcp-key.json
114-
gcloud --quiet config set project ${GOOGLE_PROJECT_ID}
115-
gcloud --quiet config set compute/zone ${GOOGLE_COMPUTE_ZONE}
116-
117-
docker tag gcr.io/${GOOGLE_PROJECT_ID}/imageserver:$CIRCLE_SHA1 gcr.io/${GOOGLE_PROJECT_ID}/imageserver:$CIRCLE_BRANCH
118-
gcloud docker -- push gcr.io/${GOOGLE_PROJECT_ID}/imageserver:$CIRCLE_SHA1
119-
gcloud docker -- push gcr.io/${GOOGLE_PROJECT_ID}/imageserver:$CIRCLE_BRANCH
120-
121102
- run:
122103
name: Push Docker image to Quay
123104
command: |
124105
docker login -u $DOCKER_USER -p $DOCKER_PASS quay.io
125-
docker tag gcr.io/${GOOGLE_PROJECT_ID}/imageserver:$CIRCLE_SHA1 quay.io/plotly/image-exporter:$CIRCLE_BRANCH
106+
docker tag quay.io/plotly/image-exporter:$CIRCLE_SHA1 quay.io/plotly/image-exporter:$CIRCLE_BRANCH
107+
docker push quay.io/plotly/image-exporter:$CIRCLE_SHA1
126108
docker push quay.io/plotly/image-exporter:$CIRCLE_BRANCH

deployment/kube/prod/frontend.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
topologyKey: "kubernetes.io/hostname"
2929
containers:
3030
- name: imageserver-app
31-
image: gcr.io/sunlit-shelter-132119/imageserver
31+
image: quay.io/plotly/image-exporter:master
3232
env:
3333
- name: MAPBOX_ACCESS_TOKEN
3434
valueFrom:

deployment/kube/stage/frontend.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
topologyKey: "kubernetes.io/hostname"
2929
containers:
3030
- name: imageserver-app
31-
image: gcr.io/sunlit-shelter-132119/imageserver
31+
image: quay.io/plotly/image-exporter:master
3232
args: ["--plotlyJS", "https://stage.plot.ly/static/plotlyjs/build/plotlyjs-bundle.js"]
3333
env:
3434
- name: MAPBOX_ACCESS_TOKEN

deployment/roles/update/tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
- debug: msg="Deploying rev {{ sha1_to_deploy }}"
66

77
- name: Ensure image exists
8-
local_action: shell gcloud container images list-tags gcr.io/sunlit-shelter-132119/imageserver |grep -q {{ sha1_to_deploy }}
8+
local_action: shell curl -o /dev/null --silent --head --fail https://quay.io/api/v1/repository/plotly/image-exporter/tag/{{ sha1_to_deploy }}/images
99

1010
- name: Rollout new image
11-
local_action: command kubectl set image deployments/imageserver imageserver-app=gcr.io/sunlit-shelter-132119/imageserver:{{ sha1_to_deploy }}
11+
local_action: command kubectl set image deployments/imageserver imageserver-app=quay.io/plotly/image-exporter:{{ sha1_to_deploy }}

0 commit comments

Comments
 (0)