Fix port collision between boots and nginx (#57)

I am not sure when it happens, it can be when we removed the NGINX_IP,
or when we checked that every services were using ports OR network_mode
but we exposed nginx and boots over the same port.

This commit fixes that.
This commit is contained in:
mergify[bot] 2021-03-03 17:39:39 +00:00 committed by GitHub
commit 407bd76da5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -114,7 +114,7 @@ services:
boots: boots:
image: ${TINKERBELL_TINK_BOOTS_IMAGE} image: ${TINKERBELL_TINK_BOOTS_IMAGE}
restart: unless-stopped restart: unless-stopped
command: -dhcp-addr 0.0.0.0:67 -tftp-addr $TINKERBELL_HOST_IP:69 -http-addr $TINKERBELL_HOST_IP:80 -log-level DEBUG network_mode: host
environment: environment:
API_AUTH_TOKEN: ${PACKET_API_AUTH_TOKEN:-ignored} API_AUTH_TOKEN: ${PACKET_API_AUTH_TOKEN:-ignored}
API_CONSUMER_TOKEN: ${PACKET_CONSUMER_TOKEN:-ignored} API_CONSUMER_TOKEN: ${PACKET_CONSUMER_TOKEN:-ignored}
@ -126,10 +126,10 @@ services:
MIRROR_HOST: ${TINKERBELL_HOST_IP:-127.0.0.1}:8080 MIRROR_HOST: ${TINKERBELL_HOST_IP:-127.0.0.1}:8080
DNS_SERVERS: 8.8.8.8 DNS_SERVERS: 8.8.8.8
PUBLIC_IP: $TINKERBELL_HOST_IP PUBLIC_IP: $TINKERBELL_HOST_IP
BOOTP_BIND: $TINKERBELL_HOST_IP:67 BOOTP_BIND: :67
HTTP_BIND: $TINKERBELL_HOST_IP:80 HTTP_BIND: :80
SYSLOG_BIND: $TINKERBELL_HOST_IP:514 SYSLOG_BIND: :514
TFTP_BIND: $TINKERBELL_HOST_IP:69 TFTP_BIND: :69
DOCKER_REGISTRY: $TINKERBELL_HOST_IP DOCKER_REGISTRY: $TINKERBELL_HOST_IP
REGISTRY_USERNAME: $TINKERBELL_REGISTRY_USERNAME REGISTRY_USERNAME: $TINKERBELL_REGISTRY_USERNAME
REGISTRY_PASSWORD: $TINKERBELL_REGISTRY_PASSWORD REGISTRY_PASSWORD: $TINKERBELL_REGISTRY_PASSWORD
@ -140,17 +140,13 @@ services:
depends_on: depends_on:
db: db:
condition: service_healthy condition: service_healthy
ports:
- $TINKERBELL_HOST_IP:80:80/tcp
- 67:67/udp
- 69:69/udp
nginx: nginx:
image: nginx:alpine image: nginx:alpine
restart: unless-stopped restart: unless-stopped
tty: true tty: true
ports: ports:
- $TINKERBELL_HOST_IP:8080:80/tcp - 8080:80/tcp
volumes: volumes:
- ./state/webroot:/usr/share/nginx/html/ - ./state/webroot:/usr/share/nginx/html/