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 #992

Merged
merged 3 commits into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
52 changes: 0 additions & 52 deletions .dockerignore

This file was deleted.

5 changes: 1 addition & 4 deletions .github/docker-compose-github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/docker-publish.yml

This file was deleted.

106 changes: 0 additions & 106 deletions Dockerfile

This file was deleted.

26 changes: 0 additions & 26 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down
14 changes: 3 additions & 11 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
5 changes: 1 addition & 4 deletions provision-catalog.sh
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading