amikhalev
/
sprinklers3
1
1
Fork 0
Code Issues 9 Pull Requests 1 Releases Wiki Activity
Browse Source

fix docker build and update react

develop
Alex Mikhalev 6 years ago
parent
b739a6772c
commit
6f6a1bbd32
6 changed files with 43 additions and 91 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      Dockerfile
  2. 3
      Dockerfile.dev
  3. 2
      docker-compose.dev.yml
  4. 2
      docker-compose.yml
  5. 16
      package.json
  6. 108
      yarn.lock

3
Dockerfile
Unescape View File

@ -5,8 +5,7 @@ WORKDIR /app/ @@ -5,8 +5,7 @@ WORKDIR /app/
COPY package.json yarn.lock /app/
RUN yarn install --frozen-lockfile
COPY tslint.json /app
COPY paths.js /app
COPY tsconfig.json tslint.json paths.js /app/
COPY client/ /app/client
COPY common/ /app/common
COPY server/ /app/server

3
Dockerfile.dev
Unescape View File

@ -5,8 +5,7 @@ WORKDIR /app/ @@ -5,8 +5,7 @@ WORKDIR /app/
COPY package.json yarn.lock /app/
RUN yarn install --frozen-lockfile
COPY paths.js /app
COPY tslint.json /app
COPY tsconfig.json tslint.json paths.js /app/
EXPOSE 8080
ENTRYPOINT [ "npm", "run", "start:dev" ]

2
docker-compose.dev.yml
Unescape View File

@ -36,7 +36,7 @@ services: @@ -36,7 +36,7 @@ services:
- "1883:1883"
database:
image: "postgres:11-alpine"
image: "postgres:11"
ports:
- "5432:5432"
environment:

2
docker-compose.yml
Unescape View File

@ -20,6 +20,6 @@ services: @@ -20,6 +20,6 @@ services:
# Must specify JWT_SECRET and MQTT_URL
database:
image: "postgres:11-alpine"
image: "postgres:11"
environment:
- POSTGRES_PASSWORD=8JN4w0UsN5dbjMjNvPe452P2yYOqg5PV

16
package.json
Unescape View File

@ -86,8 +86,8 @@ @@ -86,8 +86,8 @@
"@types/prop-types": "^15.5.5",
"@types/pump": "^1.0.1",
"@types/query-string": "^6.1.0",
"@types/react": "16.4.13",
"@types/react-dom": "16.0.7",
"@types/react": "^16.7.13",
"@types/react-dom": "^16.0.11",
"@types/react-hot-loader": "^4.1.0",
"@types/react-router-dom": "^4.3.0",
"@types/react-sortable-hoc": "^0.6.4",
@ -120,9 +120,9 @@ @@ -120,9 +120,9 @@
"promise": "^8.0.1",
"prop-types": "^15.6.2",
"query-string": "^6.1.0",
"react": "16.4.2",
"react": "^16.6.3",
"react-dev-utils": "^5.0.2",
"react-dom": "16.4.2",
"react-dom": "^16.6.3",
"react-hot-loader": "^4.3.5",
"react-router": "^4.3.1",
"react-router-dom": "^4.3.1",
@ -149,9 +149,9 @@ @@ -149,9 +149,9 @@
"webpack-dev-server": "^3.1.7"
},
"resolutions": {
"**/@types/react": "16.4.11",
"**/@types/react-dom": "16.0.7",
"**/react": "16.4.2",
"**/react-dom": "16.4.2"
"**/@types/react": "16.7.13",
"**/@types/react-dom": "16.0.11",
"**/react": "16.6.3",
"**/react-dom": "16.6.3"
}
}

108
yarn.lock
Unescape View File

@ -199,11 +199,11 @@ @@ -199,11 +199,11 @@
version "1.2.2"
resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.2.tgz#fa8e1ad1d474688a757140c91de6dace6f4abc8d"
"@types/react-dom@16.0.7":
version "16.0.7"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.7.tgz#54d0f867a76b90597e8432030d297982f25c20ba"
"@types/react-dom@16.0.11", "@types/react-dom@^16.0.11":
version "16.0.11"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.11.tgz#bd10ccb0d9260343f4b9a49d4f7a8330a5c1f081"
integrity sha512-x6zUx9/42B5Kl2Vl9HlopV8JF64wLpX3c+Pst9kc1HgzrsH+mkehe/zmHMQTplIrR48H2gpU7ZqurQolYu8XBA==
dependencies:
"@types/node" "*"
"@types/react" "*"
"@types/react-hot-loader@^4.1.0":
@ -234,16 +234,10 @@ @@ -234,16 +234,10 @@
dependencies:
"@types/react" "*"
"@types/react@*", "@types/react@16.4.11":
version "16.4.11"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.4.11.tgz#330f3d864300f71150dc2d125e48644c098f8770"
dependencies:
"@types/prop-types" "*"
csstype "^2.2.0"
"@types/react@16.4.13":
version "16.4.13"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.4.13.tgz#1385f5dc3486aa493849a32ccce626a817543e28"
"@types/react@*", "@types/react@16.7.13", "@types/react@^16.7.13":
version "16.7.13"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.7.13.tgz#d2369ae78377356d42fb54275d30218e84f2247a"
integrity sha512-WhqrQLAE9z65hfcvWqZfR6qUtIazFRyb8LXqHo8440R53dAQqNkt2OlVJ3FXwqOwAXXg4nfYxt0qgBvE18o5XA==
dependencies:
"@types/prop-types" "*"
csstype "^2.2.0"
@ -1525,10 +1519,6 @@ copy-descriptor@^0.1.0: @@ -1525,10 +1519,6 @@ copy-descriptor@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
core-js@^1.0.0:
version "1.2.7"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
core-js@^2.4.0:
version "2.5.7"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
@ -2008,12 +1998,6 @@ encodeurl@~1.0.2: @@ -2008,12 +1998,6 @@ encodeurl@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
encoding@^0.1.11:
version "0.1.12"
resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
dependencies:
iconv-lite "~0.4.13"
end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
@ -2469,18 +2453,6 @@ faye-websocket@~0.11.0: @@ -2469,18 +2453,6 @@ faye-websocket@~0.11.0:
dependencies:
websocket-driver ">=0.5.1"
fbjs@^0.8.16:
version "0.8.17"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
dependencies:
core-js "^1.0.0"
isomorphic-fetch "^2.1.1"
loose-envify "^1.0.0"
object-assign "^4.1.0"
promise "^7.1.1"
setimmediate "^1.0.5"
ua-parser-js "^0.7.18"
fd-slicer@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
@ -3179,7 +3151,7 @@ iconv-lite@0.4.23: @@ -3179,7 +3151,7 @@ iconv-lite@0.4.23:
dependencies:
safer-buffer ">= 2.1.2 < 3"
iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
dependencies:
@ -3660,13 +3632,6 @@ isobject@^3.0.0, isobject@^3.0.1: @@ -3660,13 +3632,6 @@ isobject@^3.0.0, isobject@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
isomorphic-fetch@^2.1.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
dependencies:
node-fetch "^1.0.1"
whatwg-fetch ">=0.10.0"
isstream@~0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@ -4486,13 +4451,6 @@ no-case@^2.2.0: @@ -4486,13 +4451,6 @@ no-case@^2.2.0:
dependencies:
lower-case "^1.1.1"
node-fetch@^1.0.1:
version "1.7.3"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
dependencies:
encoding "^0.1.11"
is-stream "^1.0.1"
node-forge@0.7.5:
version "0.7.5"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
@ -5592,19 +5550,13 @@ promise-inflight@^1.0.1: @@ -5592,19 +5550,13 @@ promise-inflight@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
promise@^7.1.1:
version "7.3.1"
resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
dependencies:
asap "~2.0.3"
promise@^8.0.1:
version "8.0.1"
resolved "https://registry.yarnpkg.com/promise/-/promise-8.0.1.tgz#e45d68b00a17647b6da711bf85ed6ed47208f450"
dependencies:
asap "~2.0.3"
prop-types@^15.5.7, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
prop-types@^15.5.7, prop-types@^15.6.1, prop-types@^15.6.2:
version "15.6.2"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
dependencies:
@ -5784,14 +5736,15 @@ react-dev-utils@^5.0.2: @@ -5784,14 +5736,15 @@ react-dev-utils@^5.0.2:
strip-ansi "3.0.1"
text-table "0.2.0"
react-dom@16.4.2:
version "16.4.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.2.tgz#4afed569689f2c561d2b8da0b819669c38a0bda4"
react-dom@16.6.3, react-dom@^16.6.3:
version "16.6.3"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.6.3.tgz#8fa7ba6883c85211b8da2d0efeffc9d3825cccc0"
integrity sha512-8ugJWRCWLGXy+7PmNh8WJz3g1TaTUt1XyoIcFN+x0Zbkoz+KKdUyx1AQLYJdbFXjuF41Nmjn5+j//rxvhFjgSQ==
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.0"
prop-types "^15.6.2"
scheduler "^0.11.2"
react-error-overlay@^4.0.1:
version "4.0.1"
@ -5843,14 +5796,15 @@ react-sortable-hoc@^0.8.3: @@ -5843,14 +5796,15 @@ react-sortable-hoc@^0.8.3:
invariant "^2.2.1"
prop-types "^15.5.7"
react@16.4.2:
version "16.4.2"
resolved "https://registry.yarnpkg.com/react/-/react-16.4.2.tgz#2cd90154e3a9d9dd8da2991149fdca3c260e129f"
react@16.6.3, react@^16.6.3:
version "16.6.3"
resolved "https://registry.yarnpkg.com/react/-/react-16.6.3.tgz#25d77c91911d6bbdd23db41e70fb094cc1e0871c"
integrity sha512-zCvmH2vbEolgKxtqXL2wmGCUxUyNheYn/C+PD1YAjfxHC54+MhdruyhO7QieQrYsYeTxrn93PM2y0jRH1zEExw==
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.0"
prop-types "^15.6.2"
scheduler "^0.11.2"
read-chunk@^1.0.1:
version "1.0.1"
@ -6253,6 +6207,14 @@ sax@>=0.6.0, sax@^1.2.4: @@ -6253,6 +6207,14 @@ sax@>=0.6.0, sax@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
scheduler@^0.11.2:
version "0.11.3"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.11.3.tgz#b5769b90cf8b1464f3f3cfcafe8e3cd7555a2d6b"
integrity sha512-i9X9VRRVZDd3xZw10NY5Z2cVMbdYg6gqFecfj79USv1CFN+YrJ3gIPRKf1qlY+Sxly4djoKdfx1T+m9dnRB8kQ==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
schema-utils@^0.4.2, schema-utils@^0.4.4, schema-utils@^0.4.5:
version "0.4.7"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
@ -6393,7 +6355,7 @@ set-value@^2.0.0: @@ -6393,7 +6355,7 @@ set-value@^2.0.0:
is-plain-object "^2.0.3"
split-string "^3.0.1"
setimmediate@^1.0.4, setimmediate@^1.0.5:
setimmediate@^1.0.4:
version "1.0.5"
resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
@ -7149,10 +7111,6 @@ typescript@^3.0.3: @@ -7149,10 +7111,6 @@ typescript@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.3.tgz#4853b3e275ecdaa27f78fda46dc273a7eb7fc1c8"
ua-parser-js@^0.7.18:
version "0.7.18"
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"
uglify-es@^3.3.4, uglify-es@^3.3.9:
version "3.3.9"
resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
@ -7607,10 +7565,6 @@ websocket-stream@^5.1.2: @@ -7607,10 +7565,6 @@ websocket-stream@^5.1.2:
ws "^3.2.0"
xtend "^4.0.0"
whatwg-fetch@>=0.10.0:
version "2.0.4"
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
which-module@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"

Write Preview
Loading…
Cancel
Save