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

Merged
merged 1 commit 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
22 changes: 0 additions & 22 deletions .github/workflows/docker-publish.yml

This file was deleted.

115 changes: 0 additions & 115 deletions Dockerfile

This file was deleted.

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

Expand Down
7 changes: 1 addition & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions provision-enterprise-subsidy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading