Skip to content

Commit

Permalink
chore: remove Dockerfile dependencies from Makefile and provision script
Browse files Browse the repository at this point in the history
  • Loading branch information
BilalQamar95 committed Oct 30, 2024
1 parent f0d4451 commit f26fdc6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 30 deletions.
26 changes: 0 additions & 26 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -144,34 +144,18 @@ start-devstack: ## run a local development copy of the server
open-devstack: ## open a shell on the server started by start-devstack
docker exec -it program_intent_engagement /edx/app/program-intent-engagement/devstack.sh open

pkg-devstack: ## build the program_intent_engagement image from the latest configuration and code
docker build -t program_intent_engagement:latest -f docker/build/program-intent-engagement/Dockerfile git://github.com/edx/configuration

detect_changed_source_translations: ## check if translation files are up-to-date
cd program_intent_engagement && i18n_tool changed

validate_translations: fake_translations detect_changed_source_translations ## install fake translations and check if translation files are up-to-date

docker_build:
docker build . -f Dockerfile -t openedx/program_intent_engagement

travis_docker_tag: docker_build
docker tag openedx/program_intent_engagement openedx/program_intent_engagement:$$TRAVIS_COMMIT

travis_docker_auth:
echo "$$DOCKER_PASSWORD" | docker login -u "$$DOCKER_USERNAME" --password-stdin

travis_docker_push: travis_docker_tag travis_docker_auth ## push to docker hub
docker push 'openedx/program_intent_engagement:latest'
docker push "openedx/program_intent_engagement:$$TRAVIS_COMMIT"

# devstack-themed shortcuts
dev.up: # Starts all containers
docker-compose up -d

dev.up.build:
docker-compose up -d --build

dev.down: # Kills containers and all of their data that isn't in volumes
docker-compose down

Expand All @@ -193,18 +177,8 @@ db-shell: # Run the app shell as root, enter the app's database
%-attach:
docker attach program_intent_engagement.$*

github_docker_build:
docker build . -f Dockerfile --target app -t openedx/program_intent_engagement

github_docker_tag: github_docker_build
docker tag openedx/program_intent_engagement openedx/program_intent_engagement:${GITHUB_SHA}

github_docker_auth:
echo "$$DOCKERHUB_PASSWORD" | docker login -u "$$DOCKERHUB_USERNAME" --password-stdin

github_docker_push: github_docker_tag github_docker_auth ## push to docker hub
docker push 'openedx/program_intent_engagement:latest'
docker push "openedx/program_intent_engagement:${GITHUB_SHA}"

selfcheck: ## check that the Makefile is well-formed
@echo "The Makefile is well-formed."
5 changes: 1 addition & 4 deletions provision-program-intent-engagement.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ name_dash="program-intent-engagement"
name="program_intent_engagement"
port="18781"

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 f26fdc6

Please sign in to comment.