Remove the proxy container [ci skip]
As there's only one domain for this project, using http://localhost will fine.
This commit is contained in:
parent
1dc9058117
commit
2bc3d582e9
|
@ -6,31 +6,6 @@ volumes:
|
||||||
node_modules:
|
node_modules:
|
||||||
|
|
||||||
services:
|
services:
|
||||||
proxy:
|
|
||||||
image: jwilder/nginx-proxy
|
|
||||||
ports:
|
|
||||||
- 80:80
|
|
||||||
volumes:
|
|
||||||
- /var/run/docker.sock:/tmp/docker.sock:ro
|
|
||||||
|
|
||||||
node:
|
|
||||||
image: node:14-alpine
|
|
||||||
working_dir: /node
|
|
||||||
entrypoint: sh
|
|
||||||
volumes:
|
|
||||||
- assets:/node/build
|
|
||||||
- node_modules:/node/node_modules
|
|
||||||
- ./web/themes/custom/opdavies/assets:/node/assets
|
|
||||||
- ./web/themes/custom/opdavies/package-lock.json:/node/package-lock.json
|
|
||||||
- ./web/themes/custom/opdavies/package.json:/node/package.json
|
|
||||||
- ./web/themes/custom/opdavies/postcss.config.js:/node/postcss.config.js
|
|
||||||
- ./web/themes/custom/opdavies/tailwind-colours.js:/node/tailwind-colours.js
|
|
||||||
- ./web/themes/custom/opdavies/tailwind-plugin-focus-visible.js:/node/tailwind-plugin-focus-visible.js
|
|
||||||
- ./web/themes/custom/opdavies/tailwind-safelist-classes.txt:/node/tailwind-safelist-classes.txt
|
|
||||||
- ./web/themes/custom/opdavies/tailwind.config.js:/node/tailwind.config.js
|
|
||||||
- ./web/themes/custom/opdavies/templates:/node/templates
|
|
||||||
- ./web/themes/custom/opdavies/webpack.config.js:/node/webpack.config.js
|
|
||||||
|
|
||||||
nginx:
|
nginx:
|
||||||
build:
|
build:
|
||||||
dockerfile: tools/docker/Dockerfile
|
dockerfile: tools/docker/Dockerfile
|
||||||
|
@ -43,8 +18,8 @@ services:
|
||||||
depends_on:
|
depends_on:
|
||||||
php:
|
php:
|
||||||
condition: service_started
|
condition: service_started
|
||||||
environment:
|
ports:
|
||||||
VIRTUAL_HOST: oliverdavies.localhost
|
- 80:80
|
||||||
|
|
||||||
php:
|
php:
|
||||||
build:
|
build:
|
||||||
|
@ -69,3 +44,21 @@ services:
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "bash", "-c", "echo > /dev/tcp/localhost/3306"]
|
test: ["CMD-SHELL", "bash", "-c", "echo > /dev/tcp/localhost/3306"]
|
||||||
interval: 1s
|
interval: 1s
|
||||||
|
|
||||||
|
node:
|
||||||
|
image: node:14-alpine
|
||||||
|
working_dir: /node
|
||||||
|
entrypoint: sh
|
||||||
|
volumes:
|
||||||
|
- assets:/node/build
|
||||||
|
- node_modules:/node/node_modules
|
||||||
|
- ./web/themes/custom/opdavies/assets:/node/assets
|
||||||
|
- ./web/themes/custom/opdavies/package-lock.json:/node/package-lock.json
|
||||||
|
- ./web/themes/custom/opdavies/package.json:/node/package.json
|
||||||
|
- ./web/themes/custom/opdavies/postcss.config.js:/node/postcss.config.js
|
||||||
|
- ./web/themes/custom/opdavies/tailwind-colours.js:/node/tailwind-colours.js
|
||||||
|
- ./web/themes/custom/opdavies/tailwind-plugin-focus-visible.js:/node/tailwind-plugin-focus-visible.js
|
||||||
|
- ./web/themes/custom/opdavies/tailwind-safelist-classes.txt:/node/tailwind-safelist-classes.txt
|
||||||
|
- ./web/themes/custom/opdavies/tailwind.config.js:/node/tailwind.config.js
|
||||||
|
- ./web/themes/custom/opdavies/templates:/node/templates
|
||||||
|
- ./web/themes/custom/opdavies/webpack.config.js:/node/webpack.config.js
|
||||||
|
|
|
@ -12,5 +12,5 @@ $databases['default']['default'] = [
|
||||||
];
|
];
|
||||||
|
|
||||||
$settings['trusted_host_patterns'] = [
|
$settings['trusted_host_patterns'] = [
|
||||||
'^oliverdavies.localhost$',
|
'^localhost$',
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in a new issue