Skip to content

Commit

Permalink
Merge pull request #354 from edx/bilalqamar95/dockerfile-setup-removal
Browse files Browse the repository at this point in the history
chore: removed dockerfile
  • Loading branch information
UsamaSadiq authored Dec 3, 2024
2 parents e35df15 + 7cceb5a commit b745113
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 99 deletions.
89 changes: 0 additions & 89 deletions Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ dev.migrate: # Migrates databases. Application and DB server must be up for this
docker exec -it designer.app bash -c 'cd /edx/app/designer && make migrate'

dev.up: # Starts all containers
docker-compose up -d --build
docker-compose up -d

dev.down: # Kills containers and all of their data that isn't in volumes
docker-compose down
Expand Down
6 changes: 1 addition & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@ services:
# - "3307:3306"

designer:
# Uncomment this line to use the official designer base image
# image: edxops/designer:devstack
build:
context: .
dockerfile: Dockerfile
image: edxops/designer:latest
container_name: designer.app
volumes:
- .:/edx/app/designer
Expand Down
5 changes: 1 addition & 4 deletions provision-designer.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
name="designer"
port="18808"

docker-compose up -d --build

# Install requirements
# Can be skipped right now because we're using the --build flag on docker-compose. This will need to be changed once we move to devstack.
docker-compose up -d

# Wait for MySQL
echo "Waiting for MySQL"
Expand Down

0 comments on commit b745113

Please sign in to comment.