diff --git a/.circleci/config.yml b/.circleci/config.yml index 5eba113..9a709fc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -44,9 +44,6 @@ jobs: steps: - checkout: path: ~/offen - - run: - name: Create `packages` symlink - command: ln -s ./../packages ./packages - restore_cache: key: offen-vault-{{ checksum "package.json" }} - run: @@ -67,9 +64,6 @@ jobs: steps: - checkout: path: ~/offen - - run: - name: Create `packages` symlink - command: ln -s ./../packages ./packages - restore_cache: key: offen-script-{{ checksum "package.json" }} - run: @@ -84,7 +78,7 @@ jobs: command: npm test - run: name: Bundle - command: npm run build + command: NODE_ENV=production npm run build auditorium: docker: @@ -93,9 +87,6 @@ jobs: steps: - checkout: path: ~/offen - - run: - name: Create `packages` symlink - command: ln -s ./../packages ./packages - restore_cache: key: offen-auditorium-{{ checksum "package.json" }} - run: diff --git a/.editorconfig b/.editorconfig index 98fc8b5..08ec691 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,6 +10,6 @@ insert_final_newline = true trim_trailing_whitespace = true indent_style = tab -[{*.js,*.yml,*.md,Gopkg.toml}] +[{*.js,*.yml,*.md,Gopkg.toml,package.json}] indent_style = space indent_size = 2 diff --git a/docker-compose.yml b/docker-compose.yml index 4dd302c..1954c33 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,11 +22,11 @@ database: vault: image: timbru31/node-chrome:slim - working_dir: /vault + working_dir: /offen/vault volumes: - - ./vault:/vault - - ./local.offen.dev.pem:/vault/local.offen.dev.pem - - ./local.offen.dev-key.pem:/vault/local.offen.dev-key.pem + - .:/offen + - ./local.offen.dev.pem:/offen/vault/local.offen.dev.pem + - ./local.offen.dev-key.pem:/offen/vault/local.offen.dev-key.pem command: npm start -- --port 9977 ports: - 9977:9977 @@ -36,12 +36,11 @@ vault: script: image: timbru31/node-chrome:slim - working_dir: /script + working_dir: /offen/script volumes: - - ./packages:/script/packages - - ./script:/script - - ./local.offen.dev.pem:/script/local.offen.dev.pem - - ./local.offen.dev-key.pem:/script/local.offen.dev-key.pem + - .:/offen + - ./local.offen.dev.pem:/offen/script/local.offen.dev.pem + - ./local.offen.dev-key.pem:/offen/script/local.offen.dev-key.pem command: npm start -- --port 9966 ports: - 9966:9966 @@ -50,12 +49,11 @@ script: auditorium: image: timbru31/node-chrome:slim - working_dir: /auditorium + working_dir: /offen/auditorium volumes: - - ./packages:/auditorium/packages - - ./auditorium:/auditorium - - ./local.offen.dev.pem:/auditorium/local.offen.dev.pem - - ./local.offen.dev-key.pem:/auditorium/local.offen.dev-key.pem + - .:/offen + - ./local.offen.dev.pem:/offen/auditorium/local.offen.dev.pem + - ./local.offen.dev-key.pem:/offen/auditorium/local.offen.dev-key.pem command: npm start -- --port 9955 ports: - 9955:9955