Skip to content

Commit

Permalink
chore: upgrade workflows and Dockerfile to use Ubuntu 24 LTS (#2556)
Browse files Browse the repository at this point in the history
- update migration check to use latest version of Ubuntu
- update python version in migration check action (3.8 -> 3.11)
- update Credentials Dockerfile to build on Ubuntu 24 LTS, upgrades Node and NPM versions too
  • Loading branch information
justinhynes authored Sep 4, 2024
1 parent 065088f commit 93c00e6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/migrations-mysql8-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ on:
jobs:
check_migrations:
name: check migrations
runs-on: ${{ matrix.os }}
runs-on: ubuntu-latest
strategy:
matrix:
os: [ ubuntu-20.04 ]
python-version: [ 3.8 ]
python-version: [ 3.11 ]

steps:
- name: Checkout repo
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:focal as base
FROM ubuntu:noble AS base

# System requirements
# - git; Used to pull in particular requirements from github rather than pypi,
Expand Down Expand Up @@ -30,9 +30,9 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH"
# Create Node env
RUN pip install nodeenv
ENV NODE_ENV=/edx/app/credentials/nodeenvs/credentials
RUN nodeenv $NODE_ENV --node=18.17.1 --prebuilt
RUN nodeenv $NODE_ENV --node=20.17.0 --prebuilt
ENV PATH="$NODE_ENV/bin:$PATH"
RUN npm install -g npm@9.x.x
RUN npm install -g npm@10.x.x

RUN locale-gen en_US.UTF-8
ENV LANG en_US.UTF-8
Expand Down Expand Up @@ -94,7 +94,7 @@ CMD gunicorn --workers=2 --name credentials -c /edx/app/credentials/credentials/

# We don't switch back to the app user for devstack because we need devstack users to be
# able to update requirements and generally run things as root.
FROM base as dev
FROM base AS dev
USER root
ENV DJANGO_SETTINGS_MODULE credentials.settings.devstack
RUN pip install -r /edx/app/credentials/credentials/requirements/dev.txt
Expand Down

0 comments on commit 93c00e6

Please sign in to comment.