393 Commits

Author SHA1 Message Date
Matt Rider
b17107438c Revert to passing build 2019-01-09 19:52:38 -02:00
Matt Rider
19a298d7f6 Add back static and plugins copy from build and test 2019-01-09 19:36:37 -02:00
Matt Rider
0acca8c73f Add copy everything in build and test 2019-01-09 19:15:48 -02:00
Matt Rider
cca09415c3 Fix copy path 2019-01-09 19:14:38 -02:00
Matt Rider
1a234e70f8 Copy over styleguide/dist 2019-01-09 18:54:42 -02:00
Matt Rider
39f581aefb Remove redundant copies, run yarn install in production image 2019-01-08 20:39:45 -02:00
Matt Rider
7be0e0a02a Merge branch 'master' of github.com:Human-Connection/Nitro-Web into 93-minimize-docker-image-size-with-multi-stage-build 2019-01-08 20:39:20 -02:00
Robert Schäfer
349866f20b
Merge pull request #111 from Human-Connection/i18n-pluralization
i18n pluralization
2019-01-08 16:50:14 +01:00
Matt Rider
c96e29bfcb Clean up Dockerfile 2019-01-08 11:22:51 -02:00
Matt Rider
a4ae2aa35b Add environment variable to commands 2019-01-08 10:31:49 -02:00
Matt Rider
ebc143f455 Add node env correctly in travis.yml and echo 2019-01-08 09:50:48 -02:00
Matt Rider
648e53456c Set node env to test in package.json 2019-01-08 09:37:30 -02:00
Matt Rider
bbe3899807 Merge branch '93-minimize-docker-image-size-with-multi-stage-build' of github.com:Human-Connection/Nitro-Web into 93-minimize-docker-image-size-with-multi-stage-build 2019-01-08 09:30:11 -02:00
Matt Rider
9172cd2532 Change node env to test in travis.yml 2019-01-08 09:23:56 -02:00
Matt Rider
541a8441a8 Merge branch 'master' of github.com:Human-Connection/Nitro-Web into 93-minimize-docker-image-size-with-multi-stage-build 2019-01-08 08:31:56 -02:00
Grzegorz Leoniec
3afc0e5a32
More translations applied 2019-01-07 18:52:26 +01:00
Grzegorz Leoniec
b20146eb77
Merge branch 'master' into i18n-pluralization 2019-01-07 18:37:48 +01:00
Grzegorz Leoniec
717658fd62
Merge pull request #123 from Human-Connection/lokalise-2019-01-07_18-33-34
Lokalise: Translations update
2019-01-07 18:35:53 +01:00
lokalise-bot
0b153d1fff Lokalise: update of locales/pt.json 2019-01-07 18:33:44 +01:00
lokalise-bot
af10c422db Lokalise: update of locales/pl.json 2019-01-07 18:33:43 +01:00
lokalise-bot
f642a0cf61 Lokalise: update of locales/nl.json 2019-01-07 18:33:42 +01:00
lokalise-bot
35a2f13f41 Lokalise: update of locales/it.json 2019-01-07 18:33:41 +01:00
lokalise-bot
acc060a8fa Lokalise: update of locales/fr.json 2019-01-07 18:33:39 +01:00
lokalise-bot
3ed4c39067 Lokalise: update of locales/es.json 2019-01-07 18:33:38 +01:00
lokalise-bot
43c554e429 Lokalise: update of locales/en.json 2019-01-07 18:33:37 +01:00
lokalise-bot
59c2125e41 Lokalise: update of locales/de.json 2019-01-07 18:33:36 +01:00
Robert Schäfer
ab541300ac Remove probably unused semver dependency 2019-01-07 16:55:57 +01:00
Matt Rider
890d22421c Change node env to test for build-and-test 2019-01-05 15:46:56 -02:00
Matt Rider
124f8be370 Copy everything over in the base image 2019-01-05 14:25:31 -02:00
Matt Rider
9f8a292c7e Fix lint issues 2019-01-04 20:59:33 -02:00
Matt Rider
beac045d5f Copy components and store, remove in production
Needed to run tests
2019-01-04 20:42:01 -02:00
Matt Rider
11a7f0a41a Copy eslint config, test files 2019-01-04 20:29:45 -02:00
Matt Rider
40aedb12ee Initialize eslint 2019-01-04 20:12:42 -02:00
Matt Rider
3e3065c4a4 Refactor multistage build names, copy locales in base 2019-01-04 19:46:07 -02:00
Robert Schäfer
9541b81b08 Add folder /server to docker stage production 2019-01-04 20:08:13 +01:00
Robert Schäfer
00d1ca0129 Put CMD in base section in Dockerfile
This should fix our build server. Probably the container immediately
exited on Travis which is using the `builder` stage for testing.
2019-01-04 19:52:52 +01:00
Robert Schäfer
9b3161ae15 Fix copy+paste error backend=>webapp
@mattwr18 ouch, that was a hard to spot error. It struck my eye when I
was switching back and forth between `docker-compose.override.yml` and
`docker-compose.travis.yml`.
2019-01-04 19:18:53 +01:00
Matt Rider
b8fb1bd1c0 Revert docker-compose up command in travis.yml 2019-01-04 15:15:06 -02:00
Matt Rider
014392a7a5 Add missing up in docker-compose up 2019-01-04 15:06:59 -02:00
Matt Rider
744362a4d7 Link docker-compose to docker-compose.travis 2019-01-03 22:37:48 -02:00
Matt Rider
c575565f8c Copy plugins from builder 2019-01-03 21:06:28 -02:00
Matt Rider
e88b674a29 Configure docker-compose, travis multistage build 2019-01-03 20:22:46 -02:00
Matt Rider
5778ef3bc0 Multistage build docker 2019-01-03 19:25:20 -02:00
dependabot[bot]
d7f9769e68
Merge pull request #113 from Human-Connection/dependabot/npm_and_yarn/eslint-plugin-vue-5.1.0 2019-01-03 07:31:42 +00:00
dependabot[bot]
b5f1688fb8
Bump eslint-plugin-vue from 5.0.0 to 5.1.0
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v5.0.0...v5.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-03 06:55:48 +00:00
dependabot[bot]
3f6ca51c11
Merge pull request #112 from Human-Connection/dependabot/npm_and_yarn/cookie-universal-nuxt-2.0.12 2019-01-03 06:49:19 +00:00
dependabot[bot]
9b7695d937
Bump cookie-universal-nuxt from 2.0.11 to 2.0.12
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.0.11 to 2.0.12.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.0.11...v2.0.12)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-03 04:46:22 +00:00
Grzegorz Leoniec
9de15879f3
Merge branch 'master' into i18n-pluralization 2019-01-02 13:50:20 +01:00
dependabot[bot]
a3171d3449
Merge pull request #105 from Human-Connection/dependabot/npm_and_yarn/vuex-i18n-1.10.9 2018-12-31 19:15:12 +00:00
dependabot[bot]
188e8e3a5f
Bump vuex-i18n from 1.10.5 to 1.10.9
Bumps [vuex-i18n](https://github.com/dkfbasel/vuex-i18n) from 1.10.5 to 1.10.9.
- [Release notes](https://github.com/dkfbasel/vuex-i18n/releases)
- [Commits](https://github.com/dkfbasel/vuex-i18n/compare/v1.10.5...v1.10.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-31 18:12:13 +00:00