diff --git a/Dockerfile.local b/Dockerfile.local deleted file mode 100644 index c8e9a4fc315b19ae97afc9b8c051e3175aeee7bc..0000000000000000000000000000000000000000 --- a/Dockerfile.local +++ /dev/null @@ -1,21 +0,0 @@ -# Stage 1, based on Nginx, to have only the compiled app, ready for production with Nginx -FROM nginx:1.16 -COPY ./nginx/nginx.conf /etc/nginx/nginx.conf -COPY ./nginx/site.prod.conf /etc/nginx/conf.d/default.conf -EXPOSE 80 -CMD ["nginx", "-g", "daemon off;"] - -# Stage 0, "build-stage", based on Node.js, to build and compile the frontend -FROM node:14-alpine as build-stage - -WORKDIR /app -# install app dependencies -COPY package*.json ./ -RUN npm install - -# add app -COPY . ./ - -# start app -CMD ["npm", "start"] - diff --git a/docker-compose.local.yml b/docker-compose.local.yml index 993c16aa4b889edec039ef8932bd51ba40ee65ab..52af81ba486596cf34bcd15dc81d40a8952b364f 100644 --- a/docker-compose.local.yml +++ b/docker-compose.local.yml @@ -9,6 +9,8 @@ services: - ./key.pem:/etc/nginx/key.pem ports: - 443:443 + depends_on: + - backend database: image: mysql:5 diff --git a/keytmp.pem b/keytmp.pem deleted file mode 100644 index 6cea85953d03d5bfab48736fc51d1a533a428435..0000000000000000000000000000000000000000 --- a/keytmp.pem +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN ENCRYPTED PRIVATE KEY----- -MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIg6hUy7m+qJYCAggA -MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMyxy5+YOzwlBIIEyAeyjCYgTPl+ -JAax0tlKp6NSEB7QxmXYAewV6XY+xfvjeWg/p+qpgQJbTwGbw6JuCejDsX98Jq6F -4N9H0B3pLkbxsLawRC2xnQdQp72rex48T9/Sohc5hO2rqi+29ivmt21xhbkakRYD -i/y+ZRrJdUfvMNg58QVJFHjYZa+R1sieW9jcQ/okfiow2EnBRAy1StgudeXFrJuo -H7gXWK46rnuGCZ+SAOxMyfo5ckDYoG3Ps/9FeuDYpN1f6suTwxkjqSK4OTf2aXIh -iVIoGtTuaTmRH+WHsgBve9qudqSPjHuaKo+ydD2OQNr564XDDg08WiKnyziOTHPF -WRvoD7uPxCSlvlolcHgRInD2a5qHvc3kcv5/brNPvRj1jfx5u5SgyPWtYQeXwDul -nsq7LkDrkzl22CXxQEJAjIINvBe39i0aZW2xVbK4MJwHMOr1N3UDQXFIi6I0OZP0 -bEBR4md50/3FYxCceCxx10/+DewugykchKSF0Qha3Nw2PwPKaw6OGAM7hl8JuMcg -xEqRCpfs2eO3GCnxPOa/pzUB8LlJCY9cXNSiEGz3AMQl/Mn0+L69U4PbPHCgi4dw -0V3LzdMTROgh6QB0D54SaaFQx0tGJVf5b+HOk/aCe9UeGJpwTmaQZTGMq6YQlVbo -SN/OLI6N6rRKiAncf/DYn3h2u+DkQ8Ad9LFRB3BAtIP2+fTg63hfpNlPNqBTUy0o -5ZaZGdLmY+WdMIA1MgwRamjq40lP6WheESfhKdJMf+Ti4ta1MFNu7l8/OdsZa5JM -Dp1xqhhuhzjPAcQhllTto7MKpka0fKCaA//3XtPzrO6GQeAa1yLyMZUzgYdeopds -N5I4obvh2+uIAHb6vUUmopiJf1LIqUraV0kchHNo3A/XvgxWr/8Pv2e4Lf/zWvJi -MMRL6okbmtSs5ocMDFWfo1b9qvUKTSa9C5avm5ALLvttOS9DFdyJvg/U8fgIInrN -rN3enNwxI/43ClqCFtF9sm6CYpsVZT8N4zvFwOmMZIkuUD3n3oTNKnXBRr/QYlzo -OIPveJOo9eMkORpgJES0yEGnoeKVLY+h9QUDn9RJXxXpf758Mbofp8LX26eF69Ng -QfCdnqOcEVGdNQuQZFHFc84nVvL49TqRset5O7PiWN923vga78IC/yzgF0iwIvI8 -yEclOga1HFC97Cy43eh1qtfi2g+r/s7uIamaxxV4KwfAcX1cTgyr7Rz1b3q+1UKn -2DuqoPaTjiNzCwVMHfcZAPfrHlRnw4DALDS3gH+aRKa5SyZ2SoQX/jUVE0+chBnm -DeeHKUraCK1FQWDRn5oDocy3yNaDz/b/2hzc8Nxl7snjPlkYzqRIOsVsUzMsRw/a -5E/tnd/99U/7t6b++emGopSLpUSqjLfKN3dm063jBPHKsSpNumsU6I00qlZkXCoB -8Usqt+GszrSt9XtLvK1Su5KFjhWJTICIy3lPw056peQZAv1I1ARZcecUDyLB9wwo -wmkRPpSmALLvRLdKvQnUk/oOnnqbSJFA5pGbyNaH/0q2CYjaDi8u7UlqmRezEw9a -zEA0N10VyXZKxss9F0KaTHrsMMfjFfKSaTyxzqqNUCa8QbezyAG+ISRua2smyQbB -4AkwJDFwXtzPUivYVtBZLw== ------END ENCRYPTED PRIVATE KEY----- diff --git a/package.json b/package.json index 291c5b0875db9876ebdc5e2ef450f1d5d442e042..9c12f5274762dec10929db9f48b7d4935b1ceded 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "scripts": { "start": "react-scripts start", "build": "react-scripts build", - "docker-local-up" : "docker-compose -f docker-compose.local.yml up", - "docker-local-down" : "docker-compose -f docker-compose.local.yml down", + "local-up" : "docker-compose -f docker-compose.local.yml up && yarn start", + "local-down" : "docker-compose -f docker-compose.local.yml down", "docker": "docker run -it --rm -p 3000:3000 front-backoffice", "lint": "eslint .", "lint:fix": "eslint --fix .",