diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 43b704f..c515a25 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -3,17 +3,16 @@ services: build: dockerfile: docker/dev/app/Dockerfile volumes: - - .:/srv/app - - .env.dev:/srv/app/.env - - /srv/app/.git/ - - /srv/app/.dioxus/ - - /srv/app/dist/ - - /srv/app/debug/ - - /srv/app/node_modules/ - - /srv/app/static/ - - /srv/app/target/ - - /dev/null:/srv/app/docker-compose-dev.yml - - /dev/null:/srv/app/docker-compose-prod.yml + - ./assets:/srv/app/assets + - ./src:/srv/app/src + - ./migrations:/srv/app/migrations + - ./Cargo.lock:/srv/app/Cargo.lock + - ./Cargo.toml:/srv/app/Cargo.toml + - ./diesel.toml:/srv/app/diesel.toml + - ./Dioxus.toml:/srv/app/Dioxus.toml + - ./package.json:/srv/app/package.json + - ./package-lock.json:/srv/app/package-lock.json + - ./tailwind.config.js:/srv/app/tailwind.config.js restart: always ports: [ "8000:8000" ] depends_on: [ "db" ] diff --git a/docker/dev/app/Dockerfile b/docker/dev/app/Dockerfile index 838d6e0..ef23140 100644 --- a/docker/dev/app/Dockerfile +++ b/docker/dev/app/Dockerfile @@ -11,6 +11,13 @@ RUN npm install COPY docker/dev/app/supervisord.conf /etc/supervisor/conf.d/supervisord.conf +RUN chown -R 1000:1000 /srv/app +RUN chown -R 1000:1000 /usr/local/cargo +RUN mkdir -p /.local/share/dioxus +RUN chown -R 1000:1000 /.local/share/dioxus + HEALTHCHECK CMD curl --fail http://localhost:8000 || exit 1 -USER root + +USER 1000:1000 + CMD ["supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]