Browse Source

Updating to make sure the envoy generated dev file is very obviously not to be edited.

master
mike12345567 6 years ago
parent
commit
16b5b19027
  1. 2
      .gitignore
  2. 2
      hosting/docker-compose.dev.yaml
  3. 2
      packages/server/scripts/dev/manage.js

2
.gitignore

@ -63,7 +63,7 @@ typings/
# dotenv environment variables file # dotenv environment variables file
.env .env
!hosting/.env !hosting/.env
hosting/generated-envoy.dev.yaml hosting/.generated-envoy.dev.yaml
# parcel-bundler cache (https://parceljs.org/) # parcel-bundler cache (https://parceljs.org/)
.cache .cache

2
hosting/docker-compose.dev.yaml

@ -27,7 +27,7 @@ services:
restart: always restart: always
image: envoyproxy/envoy:v1.16-latest image: envoyproxy/envoy:v1.16-latest
volumes: volumes:
- ./generated-envoy.dev.yaml:/etc/envoy/envoy.yaml - ./.generated-envoy.dev.yaml:/etc/envoy/envoy.yaml
ports: ports:
- "${MAIN_PORT}:10000" - "${MAIN_PORT}:10000"
depends_on: depends_on:

2
packages/server/scripts/dev/manage.js

@ -25,7 +25,7 @@ async function init() {
// generate envoy file, always do this incase it has changed // generate envoy file, always do this incase it has changed
const hostingPath = path.join(process.cwd(), "..", "..", "hosting") const hostingPath = path.join(process.cwd(), "..", "..", "hosting")
const envoyHbsPath = path.join(hostingPath, "envoy.dev.yaml.hbs") const envoyHbsPath = path.join(hostingPath, "envoy.dev.yaml.hbs")
const envoyOutputPath = path.join(hostingPath, "generated-envoy.dev.yaml") const envoyOutputPath = path.join(hostingPath, ".generated-envoy.dev.yaml")
const contents = fs.readFileSync(envoyHbsPath, "utf8") const contents = fs.readFileSync(envoyHbsPath, "utf8")
const config = { const config = {
address: isLinux() ? "172.17.0.1" : "host.docker.internal", address: isLinux() ? "172.17.0.1" : "host.docker.internal",

Loading…
Cancel
Save