Skip to content

Commit

Permalink
Merge pull request #341 from edx/remove-dockerfile-and-config
Browse files Browse the repository at this point in the history
build: remove Dockerfile and related config
  • Loading branch information
UsamaSadiq authored Dec 5, 2024
2 parents efd5e4d + f9939db commit de88f71
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 158 deletions.
22 changes: 0 additions & 22 deletions .github/workflows/docker-publish.yml

This file was deleted.

102 changes: 0 additions & 102 deletions Dockerfile

This file was deleted.

32 changes: 0 additions & 32 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -150,34 +150,15 @@ 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 edx_exams /edx/app/edx-exams/devstack.sh open

pkg-devstack: ## build the edx_exams image from the latest configuration and code
docker build -t edx_exams:latest -f docker/build/edx-exams/Dockerfile git://github.com/edx/configuration

detect_changed_source_translations: ## check if translation files are up-to-date
cd edx_exams && 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/edx_exams

travis_docker_tag: docker_build
docker tag openedx/edx_exams openedx/edx_exams:$$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/edx_exams:latest'
docker push "openedx/edx_exams:$$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 @@ -199,18 +180,5 @@ db-shell: # Run the app shell as root, enter the app's database
%-attach:
docker attach edx_exams.$*

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

github_docker_tag: github_docker_build
docker tag openedx/edx_exams openedx/edx_exams:${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/edx_exams:latest'
docker push "openedx/edx_exams:${GITHUB_SHA}"

selfcheck: ## check that the Makefile is well-formed
@echo "The Makefile is well-formed."
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:

app:
# Uncomment this line to use the official edx_exams base image
image: openedx/edx_exams
image: edxops/edx_exams

container_name: edx_exams.app
volumes:
Expand Down
2 changes: 1 addition & 1 deletion provision-edx-exams.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name="edx_exams"
port="18740"

docker-compose up -d --build
docker-compose up -d

# 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.
Expand Down

0 comments on commit de88f71

Please sign in to comment.