From d621e4e58013d6299c6f893825be58a040ecc00f Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Sat, 20 Mar 2021 13:52:38 -0800 Subject: [PATCH] Fix Docker/Dev ENV MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * basic crud NOT SECURE * refactor/database init on startup * added scratch.py * tests/user CRUD routes * password hashing * change app_config location * bump python version * formatting * login ui starter * change import from url design * move components * remove old snackbar * refactor/Componenet folder structure rework * refactor/remove old code * refactor/rename componenets/js files * remove console.logs * refactor/ models to schema and sql to models * new header styling for imports * token request * fix url scrapper * refactor/rename schema files * split routes file * redesigned admin page * enable relative imports for vue components * refactor/switch to pages view * add CamelCase package * majors settings rework * user management second pass * super user CRUD * refactor/consistent models names * refactor/consistent model names * password reset * store refactor * dependency update * abstract button props * profile page refactor * basic password validation * login form refactor/split v-container * remo unused code * hide editor buttons when not logged in * mkdocs dev dependency * v0.4.0 docs update * profile image upload * additional token routes * Smaller recipe cards for smaller viewports * fix admin sidebar * add users * change to outlined * theme card starter * code cleanup * signups * signup pages * fix #194 * fix #193 * clarify mealie_port * fix #184 * fixes #178 * fix blank card error on meal-plan creator * admin signup * formatting * improved search bar * improved search bar * refresh token on page refresh * allow mealplan with no categories * fix card layout * remove cdn dependencies * start on groups * Fixes #196 * recipe databse refactor * changelog draft * database refactoring * refactor recipe schema/model * site settings refactor * continued model refactor * merge docs changes from master * site-settings work * cleanup + tag models * notes * typo * user table * sign up data validation * package updates * group store init * Fix home page settings * group admin init * group dashboard init * update deps * formatting * bug / added libffi-dev * pages refactor * fix mealplan * docs update * multi group supporot for job scheduler * formatting * formatting * home-page redesign * set background for docs darkmode * code cleanup * docs refactor * v0.4.0 image * mkdocs port change * formatting * Fix Meal-Plan Today * fix webhook bug * fix meal plan this week * export users * 📦 Proper Package + Black Config * formatting * delete old files * fix ci * fix failing builds * package/makefile docs update * add docs server to tasks * uncomment docker-compose * reload in dev env Co-authored-by: hay-kot --- Dockerfile.dev | 2 +- docker-compose.dev.yml | 42 +++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Dockerfile.dev b/Dockerfile.dev index 693dc8a2d..8f3d38ffa 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -18,4 +18,4 @@ RUN poetry install COPY ./mealie /app/mealie -CMD ["uvicorn", "mealie.app:app", "--host", "0.0.0.0", "--port", "9000"] \ No newline at end of file +CMD ["uvicorn", "mealie.app:app", "--host", "0.0.0.0", "--port", "9000", "--reload"] \ No newline at end of file diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index f1b6acc36..eb1b33251 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -2,19 +2,19 @@ version: "3.1" services: # Vue Frontend - # mealie-frontend: - # image: mealie-frontend:dev - # build: - # context: ./frontend - # dockerfile: frontend.Dockerfile - # restart: always - # ports: - # - 9920:8080 - # environment: - # VUE_APP_API_BASE_URL: "http://mealie-api:9000" - # volumes: - # - ./frontend/:/app - # - /app/node_modules + mealie-frontend: + image: mealie-frontend:dev + build: + context: ./frontend + dockerfile: frontend.Dockerfile + restart: always + ports: + - 9920:8080 + environment: + VUE_APP_API_BASE_URL: "http://mealie-api:9000" + volumes: + - ./frontend/:/app + - /app/node_modules # Fast API mealie-api: @@ -32,11 +32,11 @@ services: - ./app_data:/app_data - ./mealie:/app - # mealie-docs: - # image: squidfunk/mkdocs-material - # restart: always - # ports: - # - 9922:8000 - # volumes: - # - ./docs:/docs - + # Mkdocs + mealie-docs: + image: squidfunk/mkdocs-material + restart: always + ports: + - 9922:8000 + volumes: + - ./docs:/docs