From 0a30f8ececa528a9a590d03e3f2f5a8056fadd16 Mon Sep 17 00:00:00 2001 From: Shota Yamazaki Date: Sat, 13 Jul 2019 07:43:59 +0900 Subject: [PATCH 1/8] =?UTF-8?q?Add:=20master=E3=83=96=E3=83=A9=E3=83=B3?= =?UTF-8?q?=E3=83=81=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=8C=E3=81=82=E3=81=A3?= =?UTF-8?q?=E3=81=9F=E9=9A=9B=E3=80=81CI=E4=B8=8A=E3=81=A7image=20build?= =?UTF-8?q?=E3=81=97=E3=81=A6dockerhub=E3=81=ABpush=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 07929bc..b98ce2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,6 +4,10 @@ executors: docker: - image: shotayamazaki/cci-docker-primary:latest + docker_image_build_executor: + docker: + - image: docker:stable-git + jobs: test: executor: elaborate-base @@ -69,6 +73,25 @@ jobs: name: deploy master to firebase hosting command: node_modules/.bin/firebase deploy --token=$FIREBASE_TOKEN + docker_image_build: + executor: docker_image_build_executor + steps: + - checkout + - setup_remote_docker: + docker_layer_caching: true + version: '18.09.3' + - run: + name: docker login + command: | + echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USER --password-stdin + - run: + name: dcoker image build + command: | + docker image build --tag "shotayamazaki/cci-docker-primary:latest" + - run: + name: docker image push + command: docker image push shotayamazaki/cci-docker-primary:latest + workflows: version: 2 test_deploy: From 7c2512a276186f6c60d2b45b0c0cdea448df3f5d Mon Sep 17 00:00:00 2001 From: Shota Yamazaki Date: Sat, 13 Jul 2019 07:46:47 +0900 Subject: [PATCH 2/8] commit all MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix: fix typo & try again Fix: fix notation Fix: remove image build from work flow Fix: remove job work flowでjobが正しく呼ばれているかテスト executorを変えてテスト workflowの設定を変えてテスト Fix: fix workflow notation Fix: fix workflow version Fix: notation Add: add orbs Fix: ネストを修正 Fix: ネストを修正 remove unnecessay diff --- .circleci/config.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b98ce2f..f206e2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -78,19 +78,17 @@ jobs: steps: - checkout - setup_remote_docker: - docker_layer_caching: true - version: '18.09.3' + docker_layer_caching: true + version: '18.09.3' - run: - name: docker login - command: | - echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USER --password-stdin + name: docker login + command: echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USER --password-stdin - run: - name: dcoker image build - command: | - docker image build --tag "shotayamazaki/cci-docker-primary:latest" + name: docker image build + command: docker image build --tag "shotayamazaki/cci-docker-primary:latest" - run: - name: docker image push - command: docker image push shotayamazaki/cci-docker-primary:latest + name: docker image push + command: docker image push shotayamazaki/cci-docker-primary:latest workflows: version: 2 @@ -103,3 +101,7 @@ workflows: filters: branches: only: master + - docker_image_build: + filters: + branches: + only: master From d820f26a1af7a7d121eb90ad5633afaf97b1f3ca Mon Sep 17 00:00:00 2001 From: Shota Yamazaki Date: Sun, 14 Jul 2019 08:59:16 +0900 Subject: [PATCH 3/8] =?UTF-8?q?Fix:=20requires=E3=81=AE=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E3=80=81password=E5=91=A8=E3=82=8A=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f206e2f..454d576 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -82,7 +82,7 @@ jobs: version: '18.09.3' - run: name: docker login - command: echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USER --password-stdin + command: echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD - run: name: docker image build command: docker image build --tag "shotayamazaki/cci-docker-primary:latest" @@ -102,6 +102,8 @@ workflows: branches: only: master - docker_image_build: + requires: + - test filters: branches: only: master From 1e6a94ee9aad9cdeddabffb84f532631869e32c3 Mon Sep 17 00:00:00 2001 From: Shota Yamazaki Date: Sun, 14 Jul 2019 15:51:51 +0900 Subject: [PATCH 4/8] Fix: use docker compose --- .circleci/config.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 454d576..50eda42 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -85,7 +85,7 @@ jobs: command: echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD - run: name: docker image build - command: docker image build --tag "shotayamazaki/cci-docker-primary:latest" + command: docker-compose build - run: name: docker image push command: docker image push shotayamazaki/cci-docker-primary:latest diff --git a/docker-compose.yml b/docker-compose.yml index f4148b5..cdf52c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: elaborate: build: ./ # Dockerfileがあるディレクトリのパス - image: elaborate/webpack # イメージを指定(IMAGEタグはコンテナ作成後docker ps -aで得られる) + image: shotayamazaki/cci-docker-primary:latest container_name: elaborate ports: - "0.0.0.0:8080:8080" # "ホストのポート:コンテナのポート" From b9294356e81628be88add592d60af509acf526c3 Mon Sep 17 00:00:00 2001 From: Shota Yamazaki Date: Sun, 14 Jul 2019 16:54:02 +0900 Subject: [PATCH 5/8] remove echo --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 50eda42..012b667 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -82,7 +82,7 @@ jobs: version: '18.09.3' - run: name: docker login - command: echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD + command: $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD - run: name: docker image build command: docker-compose build From 08a631ece8353d5c50fd12debb1740634859dd04 Mon Sep 17 00:00:00 2001 From: Shota Yamazaki <40731267+sy-tencho@users.noreply.github.com> Date: Sun, 14 Jul 2019 17:22:54 +0900 Subject: [PATCH 6/8] Update .circleci/config.yml Co-Authored-By: Taishi Murakami --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 012b667..9e7d578 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -82,7 +82,7 @@ jobs: version: '18.09.3' - run: name: docker login - command: $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD + command: docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASSWORD - run: name: docker image build command: docker-compose build From 49641396b67e57d2c1dc02aecb3cc002a9b8c597 Mon Sep 17 00:00:00 2001 From: Shota Yamazaki <40731267+sy-tencho@users.noreply.github.com> Date: Sun, 14 Jul 2019 17:23:27 +0900 Subject: [PATCH 7/8] Update .circleci/config.yml Co-Authored-By: Taishi Murakami --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9e7d578..9052653 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,7 +88,7 @@ jobs: command: docker-compose build - run: name: docker image push - command: docker image push shotayamazaki/cci-docker-primary:latest + command: docker push shotayamazaki/cci-docker-primary:latest workflows: version: 2 From 1202ec920e1ac4774c9591f465231a53abc87fbd Mon Sep 17 00:00:00 2001 From: Shota Yamazaki Date: Sun, 14 Jul 2019 17:26:48 +0900 Subject: [PATCH 8/8] fix --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index cdf52c9..d0f03ff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: elaborate: build: ./ # Dockerfileがあるディレクトリのパス - image: shotayamazaki/cci-docker-primary:latest + image: elaborate/webpack container_name: elaborate ports: - "0.0.0.0:8080:8080" # "ホストのポート:コンテナのポート"