Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Huniafatima/downgrade setuptools #7

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions .github/workflows/push-docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
- master
- open-release/**

pull_request:
branches:
- '**'
jobs:
push:
runs-on: ubuntu-latest
Expand All @@ -17,16 +20,6 @@ jobs:
# Use the release name as the image tag if we're building an open release branch.
# Examples: if we're building 'open-release/maple.master', tag the image as 'maple.master'.
# Otherwise, we must be building from a push to master, so use 'latest'.
- name: Get tag name
id: get-tag-name
uses: actions/github-script@v5
with:
script: |
const branchName = context.ref.split('/').slice(-1)[0];
const tagName = branchName === 'master' ? 'latest' : branchName;
console.log('Will use tag: ' + tagName);
return tagName;
result-encoding: string

- name: Build and push Dev Docker image
uses: docker/build-push-action@v1
Expand All @@ -36,7 +29,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_PASSWORD }}
target: dev
repository: edxops/registrar-dev
tags: ${{ steps.get-tag-name.outputs.result }},${{ github.sha }}
tags: latest,${{ github.sha }}

# - name: Build and push prod Docker image
# uses: docker/build-push-action@v1
Expand Down
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -qy \
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

Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ wheel==0.44.0
# The following packages are considered to be unsafe in a requirements file:
pip==24.2
# via -r requirements/pip.in
setuptools==73.0.0
setuptools==70.1.0
# via -r requirements/pip.in
Loading