Merge pull request #992 from openedx/bilalqamar95/dockerfile-setup-re…

…moval

chore: removed dockerfile & workflow file

.github/docker-compose-github.yml

@@ -10,10 +10,7 @@ services:
       - enterprise_catalog_mysql8:/var/lib/mysql
 
   app:
-    image: openedx/enterprise-catalog
-    build:
-      context: ..
-      dockerfile: Dockerfile
+    image: edxops/enterprise-catalog-dev
     container_name: enterprise.catalog.app
     volumes:
       - ..:/edx/app/enterprise_catalog/enterprise_catalog

Makefile

@@ -141,9 +141,6 @@ 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_catalog /edx/app/catalog/devstack.sh open
 
-pkg-devstack: ## build the catalog image from the latest configuration and code
-	docker build -t enterprise_catalog:latest -f docker/build/enterprise_catalog/Dockerfile git://github.com/openedx/configuration
-
 detect_changed_source_translations: ## check if translation files are up-to-date
 	cd enterprise_catalog && i18n_tool changed
 
@@ -164,15 +161,6 @@ dev.migrate: # Migrates databases. Application and DB server must be up for this
 dev.up: dev.up.redis # Starts all containers
 	docker-compose up -d
 
-dev.up.build: dev.up.redis # Runs docker-compose -up -d --build
-	docker-compose up -d --build
-
-dev.up.build-no-cache: dev.up.redis
-	docker-compose build --no-cache
-	docker-compose up -d
-	docker exec -u 0 -it enterprise.catalog.app pip install -r requirements/pip-tools.txt
-	docker exec -u 0 -it enterprise.catalog.app pip-sync -q requirements/dev.txt requirements/private.* requirements/test.txt
-
 dev.up.redis:
 	docker-compose -f $(DEVSTACK_WORKSPACE)/devstack/docker-compose.yml up -d redis
 
@@ -215,23 +203,9 @@ mysql-client:  # Opens mysql client in the mysql container shell
 dev.static:
 	docker-compose exec -u 0 app python3 manage.py collectstatic --noinput
 
-docker_build: ## Builds with the latest enterprise catalog
-	docker build . --target app -t openedx/enterprise-catalog:latest
-	docker build . --target newrelic -t openedx/enterprise-catalog:latest-newrelic
-
-docker_tag: docker_build
-	docker tag openedx/enterprise-catalog openedx/enterprise-catalog:$$GITHUB_SHA
-	docker tag openedx/enterprise-catalog:latest-newrelic openedx/enterprise-catalog:$$GITHUB_SHA-newrelic
-
 docker_auth:
 	echo "$$DOCKERHUB_PASSWORD" | docker login -u "$$DOCKERHUB_USERNAME" --password-stdin
 
-docker_push: docker_tag docker_auth ## push to docker hub
-	docker push 'openedx/enterprise-catalog:latest'
-	docker push "openedx/enterprise-catalog:$$GITHUB_SHA"
-	docker push 'openedx/enterprise-catalog:latest-newrelic'
-	docker push "openedx/enterprise-catalog:$$GITHUB_SHA-newrelic"
-
 check_keywords: ## Scan the Django models in all installed apps in this project for restricted field names
 	python manage.py check_reserved_keywords --override_file db_keyword_overrides.yml
 

docker-compose.yml

@@ -22,11 +22,7 @@ services:
     command: memcached -vv
 
   app:
-    # Uncomment this line to use the official catalog base image
-    # image: edxops/enterprise_catalog:devstack
-    build:
-      context: .
-      dockerfile: Dockerfile
+    image: edxops/enterprise-catalog-dev
     container_name: enterprise.catalog.app
     hostname: app.catalog.enterprise
     volumes:
@@ -56,9 +52,7 @@ services:
       ENABLE_DJANGO_TOOLBAR: 1
 
   worker:
-    build:
-      context: .
-      dockerfile: Dockerfile
+    image: edxops/enterprise-catalog-dev
     command: bash -c 'cd /edx/app/enterprise_catalog/enterprise_catalog && celery -A enterprise_catalog worker -Q enterprise_catalog.default -l DEBUG'
     container_name: enterprise.catalog.worker
     depends_on:
@@ -84,9 +78,7 @@ services:
       - .:/edx/app/enterprise_catalog/enterprise_catalog
 
   curations_worker:
-    build:
-      context: .
-      dockerfile: Dockerfile
+    image: edxops/enterprise-catalog-dev
     command: bash -c 'cd /edx/app/enterprise_catalog/enterprise_catalog && celery -A enterprise_catalog worker -Q enterprise_catalog.curations -l DEBUG'
     container_name: enterprise.catalog.curations
     depends_on:

provision-catalog.sh

@@ -1,10 +1,7 @@
 name="enterprise_catalog"
 port="18160"
 
-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"