diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml deleted file mode 100644 index 0452cf2..0000000 --- a/.github/workflows/docker-publish.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Push Docker Images - -on: - push: - branches: - - main -jobs: - # Push image to GitHub Packages. - # See also https://docs.docker.com/docker-hub/builds/ - push: - runs-on: ubuntu-latest - if: github.event_name == 'push' - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Build and Push docker image - env: - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - run : make github_docker_push diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 21c7808..0000000 --- a/Dockerfile +++ /dev/null @@ -1,101 +0,0 @@ -FROM ubuntu:focal as app -MAINTAINER sre@edx.org - - -# Packages installed: - -# language-pack-en locales; ubuntu locale support so that system utilities have a consistent -# language and time zone. - -# python; ubuntu doesnt ship with python, so this is the python we will use to run the application - -# python3-pip; install pip to install application requirements.txt files - -# libmysqlclient-dev; to install header files needed to use native C implementation for -# MySQL-python for performance gains. - -# pkg-config; mysqlclient>=2.2.0 requires pkg-config (https://github.com/PyMySQL/mysqlclient/issues/620) - -# libssl-dev; # mysqlclient wont install without this. - -# python3-dev; to install header files for python extensions; much wheel-building depends on this - -# gcc; for compiling python extensions distributed with python packages like mysql-client - -# ENV variables for Python 3.12 support -ARG PYTHON_VERSION=3.12 -ENV TZ=UTC -ENV TERM=xterm-256color -ENV DEBIAN_FRONTEND=noninteractive - -# software-properties-common is needed to setup Python 3.12 env -RUN apt-get update && \ - apt-get install -y software-properties-common && \ - apt-add-repository -y ppa:deadsnakes/ppa - -# If you add a package here please include a comment above describing what it is used for -RUN apt-get update && apt-get -qy install --no-install-recommends \ - language-pack-en \ - locales \ - # libmysqlclient-dev header files needed to use native C implementation for MySQL-python for performance gains. - libmysqlclient-dev \ - # mysqlclient>=2.2.0 requires pkg-config (https://github.com/PyMySQL/mysqlclient/issues/620) - pkg-config \ - # mysqlclient wont install without libssl-dev - libssl-dev \ - build-essential \ - gcc \ - curl \ - python3-pip \ - python${PYTHON_VERSION} \ - python${PYTHON_VERSION}-dev \ - python${PYTHON_VERSION}-distutils - - -# need to use virtualenv pypi package with Python 3.12 -RUN pip install --upgrade pip setuptools -RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python${PYTHON_VERSION} -RUN pip install virtualenv - -RUN pip install --upgrade pip setuptools -# delete apt package lists because we do not need them inflating our image -RUN rm -rf /var/lib/apt/lists/* - -RUN ln -s /usr/bin/python3 /usr/bin/python - -# Setup zoneinfo for Python 3.12 -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone - -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL en_US.UTF-8 -ENV DJANGO_SETTINGS_MODULE program_intent_engagement.settings.production - -EXPOSE 18781 -RUN useradd -m --shell /bin/false app - -WORKDIR /edx/app/program-intent-engagement - -# Copy the requirements explicitly even though we copy everything below -# this prevents the image cache from busting unless the dependencies have changed. -COPY requirements/production.txt /edx/app/program-intent-engagement/requirements/production.txt - -ARG INTENT_MANAGEMENT_VENV_DIR="/edx/app/venvs/program-intent-management" -RUN virtualenv -p python${PYTHON_VERSION} --always-copy ${INTENT_MANAGEMENT_VENV_DIR} - -# Dependencies are installed as root so they cannot be modified by the application user. -RUN pip install -r requirements/production.txt - -RUN mkdir -p /edx/var/log - -# Code is owned by root so it cannot be modified by the application user. -# So we copy it before changing users. -USER app - -# Gunicorn 19 does not log to stdout or stderr by default. Once we are past gunicorn 19, the logging to STDOUT need not be specified. -CMD gunicorn --workers=2 --name program-intent-engagement -c /edx/app/program-intent-engagement/program_intent_engagement/docker_gunicorn_configuration.py --log-file - --max-requests=1000 program_intent_engagement.wsgi:application - -# This line is after the requirements so that changes to the code will not -# bust the image cache -COPY . /edx/app/program-intent-engagement diff --git a/Makefile b/Makefile index 73be6de..51c9053 100644 --- a/Makefile +++ b/Makefile @@ -144,34 +144,18 @@ 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 program_intent_engagement /edx/app/program-intent-engagement/devstack.sh open -pkg-devstack: ## build the program_intent_engagement image from the latest configuration and code - docker build -t program_intent_engagement:latest -f docker/build/program-intent-engagement/Dockerfile git://github.com/edx/configuration - detect_changed_source_translations: ## check if translation files are up-to-date cd program_intent_engagement && 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/program_intent_engagement - -travis_docker_tag: docker_build - docker tag openedx/program_intent_engagement openedx/program_intent_engagement:$$TRAVIS_COMMIT - travis_docker_auth: echo "$$DOCKER_PASSWORD" | docker login -u "$$DOCKER_USERNAME" --password-stdin -travis_docker_push: travis_docker_tag travis_docker_auth ## push to docker hub - docker push 'openedx/program_intent_engagement:latest' - docker push "openedx/program_intent_engagement:$$TRAVIS_COMMIT" - # devstack-themed shortcuts 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 @@ -193,18 +177,8 @@ db-shell: # Run the app shell as root, enter the app's database %-attach: docker attach program_intent_engagement.$* -github_docker_build: - docker build . -f Dockerfile --target app -t openedx/program_intent_engagement - -github_docker_tag: github_docker_build - docker tag openedx/program_intent_engagement openedx/program_intent_engagement:${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/program_intent_engagement:latest' - docker push "openedx/program_intent_engagement:${GITHUB_SHA}" - selfcheck: ## check that the Makefile is well-formed @echo "The Makefile is well-formed." diff --git a/docker-compose.yml b/docker-compose.yml index c8bf51b..723a7a7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,11 +16,7 @@ services: container_name: program_intent_engagement.memcache app: - # Uncomment this line to use the official program_intent_engagement base image - # image: openedx/program_intent_engagement - build: - context: . - dockerfile: Dockerfile + image: edxops/program-intent-engagement-dev container_name: program_intent_engagement.app volumes: - .:/edx/app/program-intent-engagement diff --git a/provision-program-intent-engagement.sh b/provision-program-intent-engagement.sh index 5334fa3..55d3c5d 100755 --- a/provision-program-intent-engagement.sh +++ b/provision-program-intent-engagement.sh @@ -2,10 +2,7 @@ name_dash="program-intent-engagement" name="program_intent_engagement" port="18781" -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"