From 2be15fb18c60b0e33e4ef3aa5d2ccb5dcccd6299 Mon Sep 17 00:00:00 2001 From: qwer12314 Date: Mon, 20 Apr 2020 14:42:06 -0400 Subject: [PATCH 01/16] Create cloudbuild.yaml --- cloudbuild.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 cloudbuild.yaml diff --git a/cloudbuild.yaml b/cloudbuild.yaml new file mode 100644 index 0000000..fd147f0 --- /dev/null +++ b/cloudbuild.yaml @@ -0,0 +1,4 @@ +#cloudbuild.yaml +steps: +- name: ‘docker/compose:1.19.0’ + args: [‘up’, ‘-d’] From 6ce57ce7cf0390fa3e928db5dca7d74e5c4dac70 Mon Sep 17 00:00:00 2001 From: qwer12314 Date: Mon, 20 Apr 2020 14:55:03 -0400 Subject: [PATCH 02/16] Update cloudbuild.yaml --- cloudbuild.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index fd147f0..04a36ca 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -1,4 +1,4 @@ -#cloudbuild.yaml steps: -- name: ‘docker/compose:1.19.0’ +- name: 'gcr.io/$PROJECT_ID/docker-compose' args: [‘up’, ‘-d’] +tags: ['cloud-builders-community'] From 5bd4089ede831b5a39994e92b4e46b8d6dc5b92f Mon Sep 17 00:00:00 2001 From: qwer12314 Date: Mon, 20 Apr 2020 14:56:49 -0400 Subject: [PATCH 03/16] Update cloudbuild.yaml --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 04a36ca..ed06dac 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -1,4 +1,4 @@ steps: - name: 'gcr.io/$PROJECT_ID/docker-compose' args: [‘up’, ‘-d’] -tags: ['cloud-builders-community'] +tags: ['cloud-builders-community-TEST'] From 4f3930f6c70296cea701e157eae10cbd073a9f66 Mon Sep 17 00:00:00 2001 From: qwer12314 Date: Mon, 20 Apr 2020 15:00:23 -0400 Subject: [PATCH 04/16] Update cloudbuild.yaml --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index ed06dac..baabe36 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -1,4 +1,4 @@ steps: - name: 'gcr.io/$PROJECT_ID/docker-compose' args: [‘up’, ‘-d’] -tags: ['cloud-builders-community-TEST'] +tags: ['cloud-builders-TEST'] From c5d149a9aacba90d7e0045477853676cfa3d0f30 Mon Sep 17 00:00:00 2001 From: qwer12314 Date: Mon, 20 Apr 2020 15:14:54 -0400 Subject: [PATCH 05/16] Update cloudbuild.yaml --- cloudbuild.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index baabe36..99b4eb1 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -1,4 +1,6 @@ steps: -- name: 'gcr.io/$PROJECT_ID/docker-compose' - args: [‘up’, ‘-d’] -tags: ['cloud-builders-TEST'] +- name: docker/compose:1.24.0 + args: ['up', '-d'] +- name: 'gcr.io/cloud-builders/docker' + args: ['tag', 'workspace_app:latest', 'gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA'] +images: ['gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA'] From 5dcb83de16e0478178b70a8f1c6d70bdc3c6b5ce Mon Sep 17 00:00:00 2001 From: qwer12314 Date: Mon, 20 Apr 2020 18:01:24 -0400 Subject: [PATCH 06/16] Update docker-compose.yml --- docker-compose.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 923dbf3..7f14870 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,3 +13,8 @@ services: image: mongo ports: - '27017:27017' + volumes: + - mongodb_data_container:/data/db + +volumes: + mongodb_data_container: From c1e58b44bcc1e3ca8ae19bc6968763f44a501b55 Mon Sep 17 00:00:00 2001 From: qwer12314 Date: Mon, 20 Apr 2020 18:39:37 -0400 Subject: [PATCH 07/16] Update docker-compose.yml --- docker-compose.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7f14870..ba31740 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,15 +6,21 @@ services: build: . ports: - '80:3000' + networks: + - app-network links: - mongo + mongo: container_name: mongo image: mongo ports: - '27017:27017' volumes: - - mongodb_data_container:/data/db - -volumes: - mongodb_data_container: + - ./data/mongo:/data/db + networks: + - app-network + +networks: + app-network: + driver: bridge From cdc657bf53e1b8a3f91f462ce4ed94248c9311e0 Mon Sep 17 00:00:00 2001 From: qwer12314 Date: Mon, 20 Apr 2020 18:44:05 -0400 Subject: [PATCH 08/16] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ba31740..d311038 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: image: mongo ports: - '27017:27017' - volumes: + volumes: - ./data/mongo:/data/db networks: - app-network From 2ef499553eaac03b536db078169d572d31d9dcf6 Mon Sep 17 00:00:00 2001 From: qwer12314 Date: Tue, 21 Apr 2020 07:25:38 -0400 Subject: [PATCH 09/16] Update cloudbuild.yaml --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 99b4eb1..042d826 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -1,6 +1,6 @@ steps: - name: docker/compose:1.24.0 - args: ['up', '-d'] + args: ['up', '-d','--build'] - name: 'gcr.io/cloud-builders/docker' args: ['tag', 'workspace_app:latest', 'gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA'] images: ['gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA'] From 02540475cea3b66bb0a71b546160899e752d9afa Mon Sep 17 00:00:00 2001 From: qwer12314 Date: Tue, 21 Apr 2020 16:37:44 -0400 Subject: [PATCH 10/16] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index d311038..0fc43e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: ports: - '27017:27017' volumes: - - ./data/mongo:/data/db + - ./data:/data/db networks: - app-network From f157cc7a29056d91f66bf55ff05f7a27a6d2697f Mon Sep 17 00:00:00 2001 From: qwer12314 Date: Tue, 21 Apr 2020 17:39:06 -0400 Subject: [PATCH 11/16] Update index.js --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index c0a57e6..e7d98e2 100644 --- a/index.js +++ b/index.js @@ -35,4 +35,4 @@ app.post('/item/add', (req, res) => { const port = 3000; -app.listen(port, () => console.log('Server running...')); +app.listen(port, () => console.log('Server corriendo...')); From 5b4a5d681ea3edc669d11960e1eb83308fe4db34 Mon Sep 17 00:00:00 2001 From: qwer12314 Date: Tue, 21 Apr 2020 19:01:23 -0400 Subject: [PATCH 12/16] Update docker-compose.yml --- docker-compose.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0fc43e8..5e18fe1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,11 +9,10 @@ services: networks: - app-network links: - - mongo - + - mongo mongo: container_name: mongo - image: mongo + image: launcher.gcr.io/google/mongodb4 ports: - '27017:27017' volumes: From a98f39738b04adc74a65d10159ae38a23c27e7b3 Mon Sep 17 00:00:00 2001 From: qwer12314 Date: Tue, 21 Apr 2020 22:53:51 -0400 Subject: [PATCH 13/16] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5e18fe1..a136dec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: - mongo mongo: container_name: mongo - image: launcher.gcr.io/google/mongodb4 + image: mongo ports: - '27017:27017' volumes: From b4a392bdbff7c8015a417316c97c784d2ce4c0cb Mon Sep 17 00:00:00 2001 From: qwer12314 Date: Wed, 22 Apr 2020 01:40:26 -0400 Subject: [PATCH 14/16] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a136dec..726c107 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: restart: always build: . ports: - - '80:3000' + - '8080:3000' networks: - app-network links: From 9ba4dc896645ccbe9c1abf4882126137a1883b62 Mon Sep 17 00:00:00 2001 From: qwer12314 Date: Wed, 22 Apr 2020 03:21:43 -0400 Subject: [PATCH 15/16] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 726c107..49e87e9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: ports: - '27017:27017' volumes: - - ./data:/data/db + - ./data:/data/db:z networks: - app-network From c168d3b6c51cd83aef5b54ac3b667a915c7ffdb0 Mon Sep 17 00:00:00 2001 From: qwer12314 Date: Thu, 23 Apr 2020 00:53:50 -0400 Subject: [PATCH 16/16] Update cloudbuild.yaml --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 042d826..e8f2108 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -3,4 +3,4 @@ steps: args: ['up', '-d','--build'] - name: 'gcr.io/cloud-builders/docker' args: ['tag', 'workspace_app:latest', 'gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA'] -images: ['gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA'] +images: ['gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA','mongo']