Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(docker): migrate containers to port 8080 #96

Merged
merged 2 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
context: infra/docker/api
target: development
expose:
- 80
- 8080
volumes:
- ./app/api:/var/www/html
environment:
Expand All @@ -27,7 +27,7 @@ services:
context: infra/docker/selfserve
target: development
expose:
- 80
- 8080
volumes:
- ./app/selfserve:/var/www/html
environment:
Expand All @@ -42,7 +42,7 @@ services:
context: infra/docker/internal
target: development
expose:
- 80
- 8080
volumes:
- ./app/internal:/var/www/html
environment:
Expand Down
2 changes: 2 additions & 0 deletions infra/docker/api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ COPY ./php.ini ${PHP_INI_DIR}/conf.d/zzzz-php.ini
# nginx server config file
COPY api.conf /etc/nginx/conf.d/api.conf

EXPOSE 8080

FROM api AS production

ADD ./api.tar.gz /var/www/html
Expand Down
4 changes: 2 additions & 2 deletions infra/docker/api/api.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
server {
listen 80;
listen [::]:80;
listen 8080;
listen [::]:8080;

server_name _;

Expand Down
2 changes: 2 additions & 0 deletions infra/docker/internal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ COPY ./php.ini ${PHP_INI_DIR}/conf.d/zzzz-php.ini
# nginx server config file
COPY internal.conf /etc/nginx/conf.d/internal.conf

EXPOSE 8080

FROM internal AS production

ADD ./internal.tar.gz /var/www/html
Expand Down
4 changes: 2 additions & 2 deletions infra/docker/internal/internal.conf
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ map $sent_http_content_type $x_frame_options {
}

server {
listen 80;
listen [::]:80;
listen 8080;
listen [::]:8080;

server_name _;

Expand Down
2 changes: 2 additions & 0 deletions infra/docker/selfserve/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ COPY ./php.ini ${PHP_INI_DIR}/conf.d/zzzz-php.ini
# nginx server config file
COPY selfserve.conf /etc/nginx/conf.d/selfserve.conf

EXPOSE 8080

FROM selfserve AS production

ADD ./selfserve.tar.gz /var/www/html
Expand Down
4 changes: 2 additions & 2 deletions infra/docker/selfserve/selfserve.conf
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ map $sent_http_content_type $x_frame_options {
}

server {
listen 80;
listen [::]:80;
listen 8080;
listen [::]:8080;

server_name _;

Expand Down
3 changes: 2 additions & 1 deletion infra/terraform/modules/service/ecs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ module "ecs_service" {
port_mappings = [
{
name = "http"
containerPort = 80
hostPort = 8080
containerPort = 8080
protocol = "tcp"
}
]
Expand Down