diff --git a/Caddyfile.dev b/Caddyfile.dev index 488aff7..ca10290 100644 --- a/Caddyfile.dev +++ b/Caddyfile.dev @@ -1,4 +1,8 @@ http://project.localhost { + reverse_proxy gulp:3000 +} + +http://django.localhost { root * /usr/src/app/ encode gzip zstd @@ -13,6 +17,10 @@ http://project.localhost { file_server /media/* } +http://gulp-socket.localhost { + reverse_proxy gulp:3001 +} + http://webmail.localhost { reverse_proxy mailhog:8025 } diff --git a/docker-compose.yaml b/docker-compose.yaml index 429b535..538940b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -12,6 +12,8 @@ services: POSTGRES_DB: ${DB_NAME} ports: - ${DB_PORT}:5432 + networks: + default: django: build: @@ -30,6 +32,8 @@ services: - postgresql links: - redis + networks: + default: caddy: image: caddy:alpine @@ -44,6 +48,10 @@ services: - .:/usr/src/app/ depends_on: - django + networks: + default: + aliases: + - django.localhost redis: image: redis:alpine @@ -51,6 +59,8 @@ services: restart: "no" expose: - ${REDIS_PORT} + networks: + default: mailhog: image: mailhog/mailhog:latest @@ -58,15 +68,23 @@ services: restart: "no" expose: - 1025 - + networks: + default: gulp: build: context: ./ dockerfile: ./Dockerfiles/gulp/Dockerfile container_name: ${PROJECT_NAME}-gulp - entrypoint: gulp + entrypoint: gulp dev restart: "no" + expose: + - 3000 + - 3001 volumes: - .:/usr/src/app/ - - /usr/src/app/node_modules \ No newline at end of file + - /usr/src/app/node_modules + depends_on: + - caddy + networks: + default: \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 5e7f094..3e87f7a 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -29,7 +29,11 @@ function initBrowserSync(cb) { browserSync.init({ notify: false, open: false, - proxy: 'http://localhost' + proxy: 'http://django.localhost', + ws: true, + socket: { + domain: 'gulp-socket.localhost' + } }); return cb; } diff --git a/templates/layouts/base.html b/templates/layouts/base.html index a28c20a..835c96e 100644 --- a/templates/layouts/base.html +++ b/templates/layouts/base.html @@ -113,10 +113,15 @@ content="" > + href="{% static 'css/mobile.css' %}" + rel="stylesheet" + media="all and (max-width: 600px)" + > + {% block content %}{% endblock %}