Skip to content

promote: stage-release to master #1941

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.

Sign up for GitHub

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

Merged
pablohashescobar merged 2 commits into from
Aug 22, 2023
Merged

promote: stage-release to master #1941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eee6658
dev: deploy docker containers (#1939)
pablohashescobar Aug 22, 2023
e833fcc
Merge pull request #1940 from makeplane/develop
pablohashescobar Aug 22, 2023
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
14 changes: 0 additions & 14 deletions docker-compose-hub.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,6 @@ services:
depends_on:
- plane-api
- plane-worker

plane-deploy:
container_name: planedeploy
image: makeplane/plane-space:latest
restart: always
command: node apps/space/server.js space
env_file:
- .env
environment:
NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL}
depends_on:
- plane-api
- plane-worker
- plane-web

plane-api:
container_name: planebackend
Expand Down
17 changes: 0 additions & 17 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,23 +60,6 @@ services:
depends_on:
- plane-api
- plane-worker
plane-deploy:
container_name: planedeploy
build:
context: .
dockerfile: ./apps/space/Dockerfile.space
args:
NEXT_PUBLIC_API_BASE_URL: http://localhost:8000
restart: always
command: /usr/local/bin/start.sh apps/space/server.js space
env_file:
- .env
environment:
NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL}
depends_on:
- plane-api
- plane-worker
- plane-web

plane-api:
container_name: planebackend
Expand Down
4 changes: 0 additions & 4 deletions nginx/nginx.conf.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ server {
proxy_pass http://planefrontend:3000/;
}

location /spaces/ {
proxy_pass http://planedeploy:3000/;
}

location /api/ {
proxy_pass http://planebackend:8000/api/;
}
Expand Down