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

…moval

chore: removed dockerfile & workflow file

Makefile

@@ -163,9 +163,6 @@ detect_changed_source_translations: ## check if translation files are up-to-date
 
 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/enterprise-subsidy --no-cache
-
 # devstack-themed shortcuts
 dev.up: dev.up.redis
 	docker-compose up -d
@@ -242,19 +239,9 @@ app-restart-devserver:  # restart just the app Django dev server
 %-attach:
 	docker attach enterprise-subsidy.$*
 
-github_docker_build:
-	docker build . -f Dockerfile --target app -t openedx/enterprise-subsidy
-
-github_docker_tag: github_docker_build
-	docker tag openedx/enterprise-subsidy openedx/enterprise-subsidy:${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/enterprise-subsidy:latest'
-	docker push "openedx/enterprise-subsidy:${GITHUB_SHA}"
-
 selfcheck: ## check that the Makefile is well-formed
 	@echo "The Makefile is well-formed."
 

docker-compose.yml

@@ -21,12 +21,7 @@ services:
     command: memcached -vv
 
   app:
-    # Uncomment this line to use the official enterprise-subsidy base image
-    # image: openedx/enterprise-subsidy
-    image: openedx/enterprise-subsidy:latest-devstack
-    build:
-      context: .
-      dockerfile: Dockerfile
+    image: edxops/enterprise-subsidy-dev
     container_name: enterprise-subsidy.app
     volumes:
       - .:/edx/app/enterprise-subsidy

provision-enterprise-subsidy.sh

@@ -5,12 +5,9 @@ set -euf -o pipefail
 name="enterprise-subsidy"
 port="18280"
 
-# docker-compose up -d --build
+# docker-compose up -d
 make dev.up
 
-# 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.
-
 # Wait for MySQL
 echo "Waiting for MySQL"
 until docker exec -i enterprise-subsidy.mysql80 mysql -u root -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null