From 0acc51dbd2f4eb17ee3889cd9391ae0acbaa4320 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 24 Sep 2021 17:26:03 -0600 Subject: [PATCH] fixed docker settings --- client/Dockerfile | 17 ++++++++++------- client/package.json | 11 ++++++----- docker-compose.yml | 18 +++++++----------- .../3e823c2a4383ac0c18d4e574135a5b08.view | Bin 0 -> 51 bytes .../3e823c2a4383ac0c18d4e574135a5b08.view | Bin 0 -> 51 bytes server/data/_dbs.couch | Bin 28877 -> 32973 bytes .../00000000-7fffffff/_users.1632426241.couch | Bin 8391 -> 12491 bytes .../kcmt2021.1632518243.couch | Bin 0 -> 8346 bytes .../80000000-ffffffff/_users.1632426241.couch | Bin 4257 -> 8357 bytes .../kcmt2021.1632518243.couch | Bin 0 -> 8346 bytes 10 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 server/data/.shards/00000000-7fffffff/_users.1632426241_design/mrview/3e823c2a4383ac0c18d4e574135a5b08.view create mode 100644 server/data/.shards/80000000-ffffffff/_users.1632426241_design/mrview/3e823c2a4383ac0c18d4e574135a5b08.view create mode 100644 server/data/shards/00000000-7fffffff/kcmt2021.1632518243.couch create mode 100644 server/data/shards/80000000-ffffffff/kcmt2021.1632518243.couch diff --git a/client/Dockerfile b/client/Dockerfile index 8569fc5..38cb524 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -1,9 +1,12 @@ -FROM node:16.9.1-alpine3.11 +FROM node:16-alpine as build-step +RUN mkdir /app WORKDIR /app -COPY package*.json ./ +ENV PATH /app/node_modules/.bin:$PATH +COPY package*.json /app RUN npm install -# COPY . ./ -EXPOSE 3000 -RUN chown -R node /app/node_modules -USER node -CMD [ "npm", "start"] +COPY . /app +# USER node +RUN npm run build + +FROM nginx:1-alpine +COPY --from=build-step /app/build /usr/share/nginx/html \ No newline at end of file diff --git a/client/package.json b/client/package.json index 6601fe9..30dfccd 100644 --- a/client/package.json +++ b/client/package.json @@ -12,13 +12,14 @@ "react-dom": "^17.0.2", "react-router-dom": "^5.3.0", "react-scripts": "4.0.3", - "web-vitals": "^1.1.2" + "web-vitals": "^1.1.2", + "serve": "^12.0.1" }, "scripts": { - "start": "./node_modules/.bin/react-scripts start", - "build": "./node_modules/.bin/react-scripts build", - "test": "./node_modules/.bin/react-scripts test", - "eject": "./node_modules/.bin/react-scripts eject" + "start": "react-scripts start", + "build": "react-scripts build", + "test": "react-scripts test", + "eject": "react-scripts eject" }, "eslintConfig": { "extends": [ diff --git a/docker-compose.yml b/docker-compose.yml index 3b08984..7c38ac2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,23 +3,21 @@ version: "3" services: scouting-client: container_name: "scouting-client" + restart: unless-stopped + env_file: + - .env build: context: ./client dockerfile: ./Dockerfile - env_file: - - .env expose: - - 3000 - - 5000 + - 80 ports: - - "3000:3000" - - "5000:5000" - volumes: - - ./client:/app - + - "80:80/tcp" couchdb: container_name: "scouting-server" restart: unless-stopped + env_file: + - .env build: context: ./server dockerfile: ./Dockerfile @@ -27,8 +25,6 @@ services: - 5984 ports: - "5984:5984" - env_file: - - .env environment: - COUCHDB_HOST=couchdb - COUCHDB_PORT=5984 diff --git a/server/data/.shards/00000000-7fffffff/_users.1632426241_design/mrview/3e823c2a4383ac0c18d4e574135a5b08.view b/server/data/.shards/00000000-7fffffff/_users.1632426241_design/mrview/3e823c2a4383ac0c18d4e574135a5b08.view new file mode 100644 index 0000000000000000000000000000000000000000..f220093885ee6b12e97973b4731696742ab91a06 GIT binary patch literal 51 zcmZQ%U|`S_<+8B0ebq01O|W={ZKil(a|Tl`P+Y*S$wte$c@2-mm8T`bQPCVJ49t0% FIRIOJ4vYW* literal 0 HcmV?d00001 diff --git a/server/data/.shards/80000000-ffffffff/_users.1632426241_design/mrview/3e823c2a4383ac0c18d4e574135a5b08.view b/server/data/.shards/80000000-ffffffff/_users.1632426241_design/mrview/3e823c2a4383ac0c18d4e574135a5b08.view new file mode 100644 index 0000000000000000000000000000000000000000..f220093885ee6b12e97973b4731696742ab91a06 GIT binary patch literal 51 zcmZQ%U|`S_<+8B0ebq01O|W={ZKil(a|Tl`P+Y*S$wte$c@2-mm8T`bQPCVJ49t0% FIRIOJ4vYW* literal 0 HcmV?d00001 diff --git a/server/data/_dbs.couch b/server/data/_dbs.couch index f9dd853cbc44df423a54a107429eb394767b72fc..7d4b21c1673ff855c607f5b8866573dc9a5e6c12 100644 GIT binary patch delta 487 zcmX^6knwCI(}uGJA`J`-SF`)<^VzfIHafa>Ewq07B!2S41bsGBLklAl<27Y&uI|@|GkOCRNSJx01BQGjKRpCOL=SKn&SN(aAHDRfJ_6jwiBYFeScZHDSrh zVKwD^pECJ;vJ|tT8Smt`$?E=LeGE1b+oZFFGQ0V=h1{LR+sBh|Hjz!zkh710owH8? z9tx_}oEtbFD1PC5g6a8o2axAC&vq{3o|M2EtI}yDExO%$uH`+hzss1VgPJo0QW!W> zlHxN`6H`))5;+pt6B#m?f#F%WErU6cIgu%Y8K|H*vnn+{GcPS4D8c3pA}m2cUJ6!O PtewaT;^j<^56A`pg0G*! delta 9 QcmX@x$aMB0Z02rkN?EnA( diff --git a/server/data/shards/00000000-7fffffff/_users.1632426241.couch b/server/data/shards/00000000-7fffffff/_users.1632426241.couch index fa005d8dfd0707f4357b6fbac7c779ec13e62f22..7eaedc65b99146cbeabd39d14b4f1776f2519146 100644 GIT binary patch delta 227 zcmV<90383vLCayV#~=v+006uJ>jCgmlkON8e>7igZ)0I>FK~5oXJsvIa&~EDcP%qz zI5IP1GGR0`I5S~mFk>+|WHe1bY)~;Z*F2?PB$3|790m;WN%|%X=DLGG!0*5 zAZ2rDXKpWFVRdw92_OIo0TCQwbairNYXBgAoB#xBYO?_Wc@B~g1QEt!YiCRlA^m!W dSJVNoV&~qI6(C0nXaiyZ03gR|VZf6-5M^x$L?!?L delta 7 OcmX?|c-(QraRmSne*??_ diff --git a/server/data/shards/00000000-7fffffff/kcmt2021.1632518243.couch b/server/data/shards/00000000-7fffffff/kcmt2021.1632518243.couch new file mode 100644 index 0000000000000000000000000000000000000000..43b2f24d1f3fbd213b0d41b8351600b7df285844 GIT binary patch literal 8346 zcmeI$KTg9i6bA6;q$y+owGyZkr~?N`14)Qj-~dcz11YkxD>up?l(2)8m6a~-Ip7$q z904RGriz6Drw3p_Oz^$I^6=i1{M$Yg5jo82G^x3uAOHafKmY;|fB*y_009U<00I#B zlLE}VYW5Mm#?Oy8ck`#))6c~+X>?DLD@CFem#X6HoH$9ci)r@#DTwTs+^ih#$3Y|x zVlVV$ba@zzg!JXepZG!G#gixuGSkGgC26B5i&CoNqSR%5%_-%y+QM7z6PD?wZMC%3 zu3gJjE>u-(wwiahx16fXRPFTH-msf+nNN!}b$2^m&NgR05q>pVMic}f009U<00Izz q00bZa0SNqifj0l&UtGPtkB|C0=Yzq69iD|h$p0p@_vXJE|Gxl3k7jZJ literal 0 HcmV?d00001 diff --git a/server/data/shards/80000000-ffffffff/_users.1632426241.couch b/server/data/shards/80000000-ffffffff/_users.1632426241.couch index 5e10722bb7bd032d9654153323b25480049ed6b8..81bf68ab74abae904832b8ad7fc7ac7af8faa95d 100644 GIT binary patch delta 245 zcmZ3exYTjOLV7^Qlg)^B&V1R zdrC@va(reAqoWCLd`fC@W_q4}d}3)y2B!i8C!?TDVo7OHYBqyH-5ds%tgOw9jPv;> s39tw*c-m#NcFx}$K`*%{F?FbTwM`UNpJ4CFd}01G>@IVRaX_LgJ=iG_U{v9ZxB^ce)< zu(h+XusO8+UAEoKJx>;5Go@`cx}ZF50E00Izz00bZa0SG_<0uX=z z1R(Gy1w`|z`SHi|;_>k5=qkL3@6XRpY7;67R5CG|l`eUOiAhn%&9d*$gsAhGH!BAm zr&2}JXrxlja;)RwFpBr4k(B93vD8`9B#ftM%@wXtdfyeMs7{$I({c;9+y^2vb=&G0 zuU*^Eb)M+5GGaL&Y;F2wk?G3c5Ick3gjGIs)&|?%9*gz4B*L#o%ZP#i1Rwwb2tWV= q5P$##AOL}XFVN=yYhmtQ?EB@z>-g;^?(eStApbX+J-q$Z`2Pj*PiWf! literal 0 HcmV?d00001