From 2a07080a089a87c6aa27cb0aaf8268c8f9fe60f4 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 23 Jan 2025 13:31:28 -0500 Subject: [PATCH] build: Drop an unused Dockerfile (#36161) * build: Drop an unused Dockerfile We never cleaned up the docker file we were using for custom github runners when we switched to standard runners. This cleans that up and removes another Docker mention that is out of date. Co-authored-by: Kyle McCormick --- scripts/ci-runner.Dockerfile | 62 ------------------------------------ scripts/compile_sass.py | 2 +- 2 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 scripts/ci-runner.Dockerfile diff --git a/scripts/ci-runner.Dockerfile b/scripts/ci-runner.Dockerfile deleted file mode 100644 index bbe7ef16dbab..000000000000 --- a/scripts/ci-runner.Dockerfile +++ /dev/null @@ -1,62 +0,0 @@ -FROM summerwind/actions-runner:v2.316.0-ubuntu-20.04-49490c4 as base - -USER root - -# Install system requirements -RUN apt-get update && \ - # Global requirements - DEBIAN_FRONTEND=noninteractive apt-get install --yes \ - build-essential git language-pack-en libmysqlclient-dev libssl-dev libxml2-dev \ - libxmlsec1-dev libxslt1-dev \ - # lynx: Required by https://github.com/openedx/edx-platform/blob/b489a4ecb122/openedx/core/lib/html_to_text.py#L16 - lynx xvfb pkg-config \ - python3-dev python3-venv \ - && rm -rf /var/lib/apt/lists/* - -# Install Mongodb 4.4 -RUN wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add - -RUN echo "deb https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list -RUN apt-get update && apt-get install -y mongodb-org=4.4.13 -EXPOSE 27017 - -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 - -WORKDIR /edx/app/edxapp/edx-platform - -ENV PATH /edx/app/edxapp/nodeenv/bin:${PATH} -ENV PATH ./node_modules/.bin:${PATH} -ENV CONFIG_ROOT /edx/etc/ -ENV PATH /edx/app/edxapp/edx-platform/bin:${PATH} -ENV SETTINGS production -RUN mkdir -p /edx/etc/ - -ENV VIRTUAL_ENV=/edx/app/edxapp/venvs/edxapp -RUN python3.8 -m venv $VIRTUAL_ENV -ENV PATH="$VIRTUAL_ENV/bin:$PATH" - - -FROM base as build - -# Install Python requirements -COPY setup.py setup.py -COPY openedx/core/lib openedx/core/lib -COPY lms lms -COPY cms cms -COPY common common -COPY xmodule xmodule -COPY requirements/pip.txt requirements/pip.txt -COPY requirements/pip-tools.txt requirements/pip-tools.txt -COPY requirements/edx/testing.txt requirements/edx/testing.txt -COPY Makefile Makefile -RUN make test-requirements - -FROM base as runner - -COPY --from=build /edx/app/edxapp/venvs/edxapp /edx/app/edxapp/venvs/edxapp - -USER runner - -CMD ["/entrypoint.sh"] diff --git a/scripts/compile_sass.py b/scripts/compile_sass.py index 14b84d003af6..70d49d21cce8 100755 --- a/scripts/compile_sass.py +++ b/scripts/compile_sass.py @@ -188,7 +188,7 @@ def compile_sass_dir( Eventually, we may eschew libsass-python altogether by switching to SassC@3.3.2, a direct CLI for libsass@3.3.2. (ref: https://github.com/sass/sassc). This would be nice because it would allow us to remove Python from the Sass build pipeline entirely. However, it would mean explicitly compiling & installing both libsass and SassC - within the edx-platform Dockerfile, which has its own drawbacks. + within the edx-platform build environment, which has its own drawbacks. """ # Constants from libsass-python SASS_STYLE_NESTED = 0