Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: removed dockerfile & workflow file #285

Merged
merged 6 commits into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions .github/workflows/docker-publish.yml

This file was deleted.

66 changes: 0 additions & 66 deletions Dockerfile

This file was deleted.

23 changes: 0 additions & 23 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -155,17 +155,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 commerce-coordinator /edx/app/commerce-coordinator/devstack.sh open

pkg-devstack: ## build the commerce-coordinator image from the latest configuration and code
docker build -t commerce-coordinator:latest -f docker/build/commerce-coordinator/Dockerfile git://github.com/openedx/configuration

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

dev.provision_docker: # start LMS, and Setup a clean commerce-coordinator stack.
bash provision-commerce-coordinator.sh

Expand All @@ -176,19 +170,12 @@ dev.run_test_query:
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

dev.stop: # Stops containers so they can be restarted
docker-compose stop

dev.multistack.up:
bash find-start-lms.sh
docker-compose up -d --build

dev.multistack.stop:
docker compose -p devstack stop
docker compose stop
Expand All @@ -212,19 +199,9 @@ db-shell: # Run the app shell as root, enter the app's database
%-attach:
docker attach commerce_coordinator.$*

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

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

selfcheck: ## check that the Makefile is well-formed
@echo "The Makefile is well-formed."

Expand Down
3 changes: 1 addition & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ services:
container_name: commerce-coordinator.memcache

app:
image: devstack # this should exist locally from previous devstack, we will build our Dockerfile
build: . # Build Dockerfile if we need to.
image: edxops/commerce-coordinator-dev
container_name: commerce-coordinator.app
volumes:
- .:/edx/app/commerce-coordinator/
Expand Down
5 changes: 1 addition & 4 deletions provision-commerce-coordinator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ NC="\x1B[0m"
bash ./find-start-lms.sh

docker-compose down -v # its ok if this fails.
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
Loading