diff --git a/.circleci/config.yml b/.circleci/config.yml index d7c760e..9d7c17e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,21 +1,21 @@ version: 2.1 executors: node-executor: - docker: - - image: circleci/node:12 - auth: - username: $DOCKERHUB_LOGIN - password: $DOCKERHUB_PASSWORD + docker: + - image: circleci/node:12 + auth: + username: $DOCKERHUB_LOGIN + password: $DOCKERHUB_PASSWORD node-and-postgresql-executor: - docker: - - image: circleci/node:12 - auth: - username: $DOCKERHUB_LOGIN - password: $DOCKERHUB_PASSWORD - - image: circleci/postgres:9.6.2-alpine - auth: - username: $DOCKERHUB_LOGIN - password: $DOCKERHUB_PASSWORD + docker: + - image: circleci/node:12 + auth: + username: $DOCKERHUB_LOGIN + password: $DOCKERHUB_PASSWORD + - image: circleci/postgres:9.6.2-alpine + auth: + username: $DOCKERHUB_LOGIN + password: $DOCKERHUB_PASSWORD environment: DATABASE_URL: "postgres://postgres:$POSTGRES_PASSWORD@localhost:5432/postgres" JWT_SECRET: string @@ -24,6 +24,7 @@ executors: API_PROTOCOL: http POSTGRES_USER: postgres POSTGRES_PASSWORD: $POSTGRES_PASSWORD + POSTGRES_DB: postgres jobs: build: executor: node-executor @@ -67,23 +68,6 @@ jobs: - run: name: Run end to end test command: yarn test:e2e - push_to_hub: - executor: buildpack - environment: - IMAGE_NAME: testimg - steps: - - checkout - - setup_remote_docker - - run: - name: Build Docker image - command: docker build -t $IMAGE_NAME:app . - - run: - name: Login to Docker Hub - command: | - echo "$DOCKERHUB_PASSWORD" | docker login -u "$DOCKERHUB_LOGIN" --password-stdin - - run: - name: Push to Docker Hub - command: docker push $IMAGE_NAME:app workflows: version: 2 integration: @@ -98,7 +82,3 @@ workflows: - test_end_to_end: requires: - build - - push_to_hub: - requires: - - test - - test_end_to_end