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.

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

chore: removed dockerfile #354

Merged
merged 3 commits into from
Dec 3, 2024
Merged

chore: removed dockerfile #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01a0cc7
chore: removed dockerfile
BilalQamar95 Oct 25, 2024
b059a8f
chore: remove Dockerfile dependencies from Makefile and provision script
BilalQamar95 Oct 30, 2024
7cceb5a
build: use latest image tag
UsamaSadiq Dec 3, 2024
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
89 changes: 0 additions & 89 deletions Dockerfile
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading