Skip to content

Commit

Permalink
chore: removed dockerfile & workflow file
Browse files Browse the repository at this point in the history
  • Loading branch information
BilalQamar95 committed Oct 30, 2024
1 parent adf1f85 commit c4d68a9
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 193 deletions.
5 changes: 1 addition & 4 deletions .github/docker-compose-github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ services:
- enterprise_access_mysql:/var/lib/mysql

app:
image: openedx/enterprise-access
build:
context: ..
dockerfile: Dockerfile
image: edxops/enterprise-access-dev
container_name: enterprise_access.app
volumes:
- ..:/edx/app/enterprise-access/enterprise_access
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/docker-publish.yml

This file was deleted.

125 changes: 0 additions & 125 deletions Dockerfile

This file was deleted.

34 changes: 0 additions & 34 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -157,25 +157,11 @@ 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 enterprise-access /edx/app/enterprise-access/devstack.sh open

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

detect_changed_source_translations: ## check if translation files are up-to-date
cd enterprise_access && 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_no_cache:
docker-compose build --no-cache

docker_build:
docker build . -f Dockerfile --target app -t openedx/enterprise-access
docker build . -f Dockerfile --target app -t openedx/enterprise-access.worker
docker build . -f Dockerfile --target newrelic -t openedx/enterprise-access:latest-newrelic

docker build . -f Dockerfile --target devstack -t openedx/enterprise-access:latest-devstack
docker build . -f Dockerfile --target devstack -t openedx/enterprise-access.worker:latest-devstack

travis_docker_tag: docker_build
docker tag openedx/enterprise-access openedx/enterprise-access:$$TRAVIS_COMMIT
docker tag openedx/enterprise-access:latest-newrelic openedx/enterprise-access:$$TRAVIS_COMMIT-newrelic
Expand All @@ -197,12 +183,6 @@ dev.provision:
dev.up: dev.up.redis
docker-compose up -d

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

dev.up.build-no-cache: docker_build_no_cache dev.up.redis
docker-compose up -d

dev.up.with-events: dev.up.kafka-control-center dev.up

# Start redis via the devstack docker-compose.yml
Expand Down Expand Up @@ -274,22 +254,8 @@ dev.static:
dev.migrate:
docker-compose exec -u 0 app python manage.py migrate

github_docker_build:
docker build . -f Dockerfile --target app -t openedx/enterprise-access
docker build . -f Dockerfile --target newrelic -t openedx/enterprise-access:latest-newrelic

github_docker_tag: github_docker_build
docker tag openedx/enterprise-access openedx/enterprise-access:${GITHUB_SHA}
docker tag openedx/enterprise-access:latest-newrelic openedx/enterprise-access:${GITHUB_SHA}-newrelic

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/enterprise-access:latest'
docker push "openedx/enterprise-access:${GITHUB_SHA}"
docker push 'openedx/enterprise-access:latest-newrelic'
docker push "openedx/enterprise-access:${GITHUB_SHA}-newrelic"

selfcheck: ## check that the Makefile is well-formed
@echo "The Makefile is well-formed."
9 changes: 2 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ services:
command: memcached -vv

app:
# Uncomment this line to use the official enterprise_access base image
image: openedx/enterprise-access:latest-devstack

image: edxops/enterprise-access-dev
container_name: enterprise_access.app
volumes:
- .:/edx/app/enterprise-access/
Expand All @@ -51,10 +49,7 @@ services:
ENABLE_DJANGO_TOOLBAR: 1

worker:
image: openedx/enterprise-access.worker:latest-devstack
build:
context: .
dockerfile: Dockerfile
image: edxops/enterprise-access-dev
command: bash -c 'cd /edx/app/enterprise-access/ && celery -A enterprise_access worker -l DEBUG'
container_name: enterprise_access.worker
depends_on:
Expand Down

0 comments on commit c4d68a9

Please sign in to comment.