diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d5d920..41f024f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,3 +19,13 @@ instructions, because git commits are used to generate release notes: + +## v17.0.0 (2023-12-09) + +- 💥 [Feature] Upgrade to Quince (by @jfavellar90). +- [Improvement] Add a scriv-compliant changelog. (by @regisb) +- [Improvement] Removing the xqueue permissions container in favor of a global single permissions container. (by @jfavellar90) +- [Bugfix] Fix "Error: service "xqueue-job" depends on undefined service mysql: invalid compose project" - add conditional statement to check whether the mysql service is enabled or if the user is using an external mysql instance. (by @ravikhetani) +- [Improvement] Added Typing to code, Makefile and test action to the repository and formatted code with Black and isort. (by @CodeWithEmad) + + diff --git a/changelog.d/20230519_161836_regis.md b/changelog.d/20230519_161836_regis.md deleted file mode 100644 index 7d796ae..0000000 --- a/changelog.d/20230519_161836_regis.md +++ /dev/null @@ -1 +0,0 @@ -- [Improvement] Add a scriv-compliant changelog. (by @regisb) diff --git a/changelog.d/20230731_080653_jhony.avella_remove_permissions_container.md b/changelog.d/20230731_080653_jhony.avella_remove_permissions_container.md deleted file mode 100644 index 0908ab0..0000000 --- a/changelog.d/20230731_080653_jhony.avella_remove_permissions_container.md +++ /dev/null @@ -1 +0,0 @@ -- [Improvement] Removing the xqueue permissions container in favor of a global single permissions container. (by @jfavellar90) diff --git a/changelog.d/20231113_135404_r.khetani.md b/changelog.d/20231113_135404_r.khetani.md deleted file mode 100644 index f66c13e..0000000 --- a/changelog.d/20231113_135404_r.khetani.md +++ /dev/null @@ -1 +0,0 @@ -- [Bugfix] Fix "Error: service "xqueue-job" depends on undefined service mysql: invalid compose project" - add conditional statement to check whether the mysql service is enabled or if the user is using an external mysql instance. (by @ravikhetani) \ No newline at end of file diff --git a/changelog.d/20231118_161232_codewithemad.md b/changelog.d/20231118_161232_codewithemad.md deleted file mode 100644 index 952a383..0000000 --- a/changelog.d/20231118_161232_codewithemad.md +++ /dev/null @@ -1 +0,0 @@ -- [Improvement] Added Typing to code, Makefile and test action to the repository and formatted code with Black and isort. (by @CodeWithEmad) \ No newline at end of file diff --git a/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile b/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile index d82401c..205f68b 100644 --- a/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile +++ b/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile @@ -1,10 +1,10 @@ -{% if is_buildkit_enabled() %}# syntax=docker/dockerfile:1.4{% endif %} +# syntax=docker/dockerfile:1.4 ###### Minimal image with base system requirements for most stages ###### FROM docker.io/ubuntu:20.04 as minimal ARG DEBIAN_FRONTEND=noninteractive -RUN {% if is_buildkit_enabled() %}--mount=type=cache,target=/var/cache/apt,sharing=locked \ - --mount=type=cache,target=/var/lib/apt,sharing=locked{% endif %} \ +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,target=/var/lib/apt,sharing=locked \ apt update && \ apt upgrade -y && \ apt install -y \ @@ -27,10 +27,12 @@ WORKDIR /openedx/xqueue ###### Install python venv ###### RUN python -m venv /openedx/venv ENV PATH /openedx/venv/bin:${PATH} - -RUN {% if is_buildkit_enabled() %}--mount=type=cache,target=/openedx/.cache/pip,sharing=shared {% endif %}pip install setuptools==68.2.2 pip==23.2.1. wheel==0.41.2 -RUN {% if is_buildkit_enabled() %}--mount=type=cache,target=/openedx/.cache/pip,sharing=shared {% endif %}pip install -r requirements.txt -RUN {% if is_buildkit_enabled() %}--mount=type=cache,target=/openedx/.cache/pip,sharing=shared {% endif %}pip install uwsgi==2.0.22 +# https://pypi.org/project/setuptools/ +# https://pypi.org/project/pip/ +# https://pypi.org/project/wheel/ +RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared pip install setuptools==68.2.2 pip==23.2.1. wheel==0.41.2 +RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared pip install -r requirements.txt +RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared pip install uwsgi==2.0.22 RUN mkdir /openedx/data /openedx/data/media