From ae901c49d503ed421cab1358b43f8c753d7610bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Fri, 27 Jan 2023 01:50:29 +0900 Subject: [PATCH] started to implement front docker compose dev --- docker-compose.dev.yml | 12 ++++++++++++ front/Dockerfile.dev | 10 ++++++++++ front/package.json | 4 +++- front/webpack.config.js | 6 ++++++ front/yarn.lock | 23 +++++++++++++++++++---- 5 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 front/Dockerfile.dev diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 192ae05..709fd32 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -39,3 +39,15 @@ services: retries: 5 ports: - "5432:5432" + front: + build: + context: ./front + args: + - API_URL=${API_URL} + - SCORO_URL=${SCORO_URL} + ports: + - "80:80" + depends_on: + - "back" + env_file: + - .env \ No newline at end of file diff --git a/front/Dockerfile.dev b/front/Dockerfile.dev new file mode 100644 index 0000000..4881fdf --- /dev/null +++ b/front/Dockerfile.dev @@ -0,0 +1,10 @@ +FROM node:16-alpine + +WORKDIR /app + +RUN yarn global add expo-cli +COPY package.json yarn.lock ./ +RUN yarn install + +ENV DEVAPIURL http://back:3000 +CMD expo start --web \ No newline at end of file diff --git a/front/package.json b/front/package.json index cbadd98..58c7b68 100644 --- a/front/package.json +++ b/front/package.json @@ -27,6 +27,7 @@ "@types/react-dom": "^18.0.6", "@types/react-query": "^1.2.9", "@types/react-test-renderer": "^18.0.0", + "add": "^2.0.6", "expo": "^47.0.8", "expo-asset": "~8.7.0", "expo-dev-client": "~2.0.1", @@ -35,6 +36,7 @@ "expo-splash-screen": "~0.17.5", "expo-status-bar": "~1.4.2", "format-duration": "^2.0.0", + "hermes-engine": "^0.11.0", "i18next": "^21.8.16", "install": "^0.13.0", "jest": "^26.6.3", @@ -47,7 +49,7 @@ "react-i18next": "^11.18.3", "react-native": "0.70.5", "react-native-paper": "^4.12.5", - "react-native-reanimated": "~2.8.0", + "react-native-reanimated": "~2.12.0", "react-native-safe-area-context": "4.4.1", "react-native-screens": "~3.18.0", "react-native-super-grid": "^4.6.1", diff --git a/front/webpack.config.js b/front/webpack.config.js index a991c45..38fcbb1 100644 --- a/front/webpack.config.js +++ b/front/webpack.config.js @@ -11,5 +11,11 @@ module.exports = async function (env, argv) { config.resolve.alias['framer-motion'] = 'framer-motion/dist/framer-motion' + config.devServer = { + proxy: { + '/api': env.DEVAPIURL ?? 'http://localhost:3000', + } + } + return config } \ No newline at end of file diff --git a/front/yarn.lock b/front/yarn.lock index 8ce6385..b2a90ff 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -5232,6 +5232,11 @@ acorn@^8.2.4, acorn@^8.5.0, acorn@^8.7.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== +add@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/add/-/add-2.0.6.tgz#248f0a9f6e5a528ef2295dbeec30532130ae2235" + integrity sha512-j5QzrmsokwWWp6kUcJQySpbG+xfOBqqKnup3OIk1pz+kB/80SLorZ9V8zHFLO92Lcd+hbvq8bT+zOGoPkmBV0Q== + address@1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" @@ -9739,6 +9744,11 @@ he@1.2.0, he@^1.2.0: resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== +hermes-engine@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.11.0.tgz#bb224730d230a02a5af02c4e090d1f52d57dd3db" + integrity sha512-7aMUlZja2IyLYAcZ69NBnwJAR5ZOYlSllj0oMpx08a8HzxHOys0eKCzfphrf6D0vX1JGO1QQvVsQKe6TkYherw== + hermes-estree@0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.8.0.tgz#530be27243ca49f008381c1f3e8b18fb26bf9ec0" @@ -14781,10 +14791,10 @@ react-native-paper@^4.12.5: color "^3.1.2" react-native-iphone-x-helper "^1.3.1" -react-native-reanimated@~2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-2.8.0.tgz#93c06ca84d91fb3865110b0857c49a24e316130e" - integrity sha512-kJvf/UWLBMaGCs9X66MKq5zdFMgwx8D0nHnolbHR7s8ZnbLdb7TlQ/yuzIXqn/9wABfnwtNRI3CyaP1aHWMmZg== +react-native-reanimated@~2.12.0: + version "2.12.0" + resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-2.12.0.tgz#5821eecfb1769b1617a67a2d4dec12fdeedb2b6e" + integrity sha512-nrlPyw+Hx9u4iJhZk9PoTvDo/QmVAd+bo7OK9Tv3hveNEF9++5oig/g3Uv9V93shy9avTYGsUprUvAEt/xdzeQ== dependencies: "@babel/plugin-transform-object-assign" "^7.16.7" "@babel/preset-typescript" "^7.16.7" @@ -18144,6 +18154,11 @@ yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" +yarn@^1.22.19: + version "1.22.19" + resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.19.tgz#4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447" + integrity sha512-/0V5q0WbslqnwP91tirOvldvYISzaqhClxzyUKXYxs07yUILIs5jx/k6CFe8bvKSkds5w+eiOqta39Wk3WxdcQ== + yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"