diff --git a/.circleci/config.yml b/.circleci/config.yml index 56ce86d..8bb2678 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -171,105 +171,6 @@ jobs: name: Run tests command: npm test - deploy_golang: - docker: - - image: circleci/golang:1.12-node - <<: *production_env - working_directory: ~/offen - steps: - - checkout: - path: ~/offen - - restore_cache: - key: offen-deploy-{{ checksum "package.json" }} - - run: - name: Install dependencies - command: npm install - - save_cache: - paths: - - ~/offen/packages/node_modules - key: offen-packages-{{ checksum "package.json" }} - - - restore_cache: - key: offen-server-{{ checksum "server/go.mod" }} - - run: - name: Build server service - working_directory: ~/offen/server - command: make build - - run: - name: Manually clear go cache - command: sudo rm -rf /go/pkg/mod - - - run: - name: Manually clear go cache - command: sudo rm -rf /go/pkg/mod - - - run: - name: Migrate `server` database - working_directory: ~/offen/server - command: | - sudo apt-get update && sudo apt-get install -qq -y python-pip libpython-dev - curl -O https://bootstrap.pypa.io/get-pip.py && sudo python get-pip.py - sudo pip install -q awscli --upgrade - go run cmd/migrate/main.go -conn $(aws secretsmanager get-secret-value --secret-id $SECRET_ID_SERVER_CONNECTION_STRING | jq -r '.SecretString') - - run: - name: Deploy - working_directory: ~/offen - command: | - echo "Deploying server ..." - $(npm bin)/sls deploy --config server/serverless.yml - - deploy_node: - docker: - - image: circleci/node:10 - <<: *production_env - working_directory: ~/offen - steps: - - checkout: - path: ~/offen - - restore_cache: - key: offen-deploy-{{ checksum "package.json" }} - - run: - name: Install dependencies - command: npm install - - save_cache: - paths: - - ~/offen/packages/node_modules - key: offen-packages-{{ checksum "package.json" }} - - restore_cache: - key: offen-auditorium-{{ checksum "auditorium/package.json" }} - - run: - name: Build auditorium service - working_directory: ~/offen/auditorium - command: npm run build - - - restore_cache: - key: offen-script-{{ checksum "script/package.json" }} - - run: - name: Build script service - working_directory: ~/offen/script - command: npm run build - - - restore_cache: - key: offen-vault-{{ checksum "vault/package.json" }} - - run: - name: Build vault service - working_directory: ~/offen/vault - command: npm run build - - - run: - name: Deploy - working_directory: ~/offen - command: | - echo "Deploying auditorium ..." - $(npm bin)/sls deploy --config auditorium/serverless.yml - $(npm bin)/sls client deploy --config auditorium/serverless.yml --no-confirm - echo "Deploying script ..." - $(npm bin)/sls deploy --config script/serverless.yml - $(npm bin)/sls client deploy --config script/serverless.yml --no-confirm - echo "Deploying vault ..." - $(npm bin)/sls deploy --config vault/serverless.yml - $(npm bin)/sls client deploy --config vault/serverless.yml --no-confirm - deploy_homepage: docker: - image: circleci/python:3.6-node @@ -341,11 +242,5 @@ workflows: <<: *build_preconditions - shared: <<: *build_preconditions - - deploy_golang: - <<: *deploy_preconditions - - deploy_node: - <<: *deploy_preconditions - - deploy_python: - <<: *deploy_preconditions - deploy_homepage: <<: *deploy_preconditions diff --git a/docker-compose.yml b/docker-compose.yml index 3a9ecaa..b2d4bf4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,9 +27,7 @@ services: - serverdeps:/go/pkg/mod environment: CORS_ORIGIN: http://localhost:9977 - OPTOUT_COOKIE_DOMAIN: localhost POSTGRES_CONNECTION_STRING: postgres://postgres:develop@server_database:5432/postgres?sslmode=disable - KMS_ENCRYPTION_ENDPOINT: http://kms:8081/encrypt PORT: 8080 DEVELOPMENT: '1' COOKIE_EXCHANGE_SECRET: Wsttdo4Z3mXV5sTc diff --git a/package.json b/package.json deleted file mode 100644 index 05f0297..0000000 --- a/package.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "offen", - "private": true, - "version": "1.0.0", - "repository": { - "type": "git", - "url": "git+https://github.com/offen/offen.git" - }, - "author": "offen", - "license": "MIT", - "bugs": { - "url": "https://github.com/offen/offen/issues" - }, - "homepage": "https://github.com/offen/offen#readme", - "dependencies": { - "serverless": "^1.45.0", - "serverless-domain-manager": "^2.6.13", - "serverless-finch": "^2.4.2", - "serverless-pseudo-parameters": "^2.4.0" - }, - "devDependencies": {} -}