Skip to content

Commit

Permalink
feat: ubuntu upgrade to 22.04
Browse files Browse the repository at this point in the history
  • Loading branch information
DawoudSheraz committed Oct 21, 2024
1 parent 63addaf commit c6e9e6c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
# It's important that we build the tutor binaries with the *oldest* possible
# OS releases and Python version. See these docs for more information:
# https://pyinstaller.org/en/stable/usage.html#making-gnu-linux-apps-forward-compatible
- os: ubuntu-24.04
- os: ubuntu-22.04
locale: C.UTF-8
# https://endoflife.date/macos
- os: macos-12
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ bootstrap-dev-plugins: bootstrap-dev ## Install dev requirements and all support
pip install -r requirements/plugins.txt

pull-base-images: # Manually pull base images
docker image pull docker.io/ubuntu:24.04
docker image pull docker.io/ubuntu:22.04

ci-info: ## Print info about environment
python --version
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
- 💥[Feature] Update Open edX Image to use Ubuntu 24.04 as base OS. (by @dawoudsheraz)
- 💥[Feature] Update Open edX Image to use Ubuntu 22.04 as base OS. (by @dawoudsheraz)
- Adds xmlsec related dependencies to fix xmlsec import issues during translations build
6 changes: 1 addition & 5 deletions tutor/templates/build/openedx/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
# syntax=docker/dockerfile:1
###### Minimal image with base system requirements for most stages
FROM docker.io/ubuntu:24.04 AS minimal
FROM docker.io/ubuntu:22.04 AS minimal
LABEL maintainer="Overhang.io <[email protected]>"

ENV DEBIAN_FRONTEND=noninteractive

# Delete default UID=1000 `ubuntu` user to ensure we can use id 1000 for app user
RUN userdel -r ubuntu

RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt,sharing=locked \
apt update && \
Expand Down Expand Up @@ -145,7 +142,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
apt update \
&& apt install -y gettext gfortran graphviz graphviz-dev libffi-dev libfreetype6-dev libgeos-dev libjpeg8-dev liblapack-dev libmysqlclient-dev libpng-dev libsqlite3-dev libxmlsec1-dev lynx mysql-client ntp pkg-config rdfind


# From then on, run as unprivileged "app" user
# Note that this must always be different from root (APP_USER_ID=0)
ARG APP_USER_ID=1000
Expand Down

0 comments on commit c6e9e6c

Please sign in to comment.