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.

Sign up for GitHub

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

Fix dogwood build #200

Merged
merged 2 commits into from
Feb 21, 2020
Merged

Fix dogwood build #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9bc94a
📌(dogwood/3/*) fix virtualenv to version 16.7.9 in Dockerfile
lunika Feb 20, 2020
fafe88b
⬆️(dogwood/3/fun) upgrade dogwood release to version 5.3.3
lunika Feb 20, 2020
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
1 change: 1 addition & 0 deletions releases/dogwood/3/bare/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ release.
### Fixed
lunika marked this conversation as resolved.
Show resolved Hide resolved
lunika marked this conversation as resolved.
Show resolved Hide resolved

- Remove hardcoded FILE_UPLOAD_STORAGE_BUCKET_NAME value to make sure it is configurable
- Downgrade and pin `virtualenv` to version 16.7.9

## [dogwood.3-1.2.1] - 2020-01-11

Expand Down
2 changes: 1 addition & 1 deletion releases/dogwood/3/bare/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ RUN groupadd --gid ${DOCKER_GID} edx || \
# To prevent permission issues related to the non-priviledged user running in
# development, we will install development dependencies in a python virtual
# environment belonging to that user
RUN pip install virtualenv
RUN pip install virtualenv==16.7.9

# Create the virtualenv directory where we will install python development
# dependencies
Expand Down
4 changes: 4 additions & 0 deletions releases/dogwood/3/fun/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ release.

## [Unreleased]

### Fixed

- Downgrade and pin `virtualenv` to version 16.7.9

## [dogwood.3-fun-1.9.1] - 2020-01-29

### Fixed
Expand Down
6 changes: 3 additions & 3 deletions releases/dogwood/3/fun/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
# .
ARG DOCKER_UID=1000
ARG DOCKER_GID=1000
ARG EDX_RELEASE_REF=dogwood.3-fun-5.3.2
ARG EDX_ARCHIVE_URL=https://github.com/openfun/edx-platform/archive/dogwood.3-fun-5.3.2.tar.gz
ARG EDX_RELEASE_REF=dogwood.3-fun-5.3.3
ARG EDX_ARCHIVE_URL=https://github.com/openfun/edx-platform/archive/dogwood.3-fun-5.3.3.tar.gz
jmaupetit marked this conversation as resolved.
Show resolved Hide resolved

# === BASE ===
FROM ubuntu:12.04 as base
Expand Down Expand Up @@ -199,7 +199,7 @@ RUN groupadd --gid ${DOCKER_GID} edx || \
# To prevent permission issues related to the non-priviledged user running in
# development, we will install development dependencies in a python virtual
# environment belonging to that user
RUN pip install virtualenv
RUN pip install virtualenv==16.7.9

# Create the virtualenv directory where we will install python development
# dependencies
Expand Down
2 changes: 1 addition & 1 deletion releases/dogwood/3/fun/activate
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export EDX_RELEASE="dogwood.3"
export FLAVOR="fun"
export EDX_RELEASE_REF="dogwood.3-fun-5.3.2"
export EDX_RELEASE_REF="dogwood.3-fun-5.3.3"
export EDX_ARCHIVE_URL="https://github.com/openfun/edx-platform/archive/${EDX_RELEASE_REF}.tar.gz"
export EDX_DEMO_RELEASE_REF="open-release/eucalyptus.1"
export EDX_DEMO_ARCHIVE_URL="file://${PWD}/releases/dogwood/3/fun/demo-course.tar.gz"