From cdb58bd8a3f38260edea28bc72be09d72469070e Mon Sep 17 00:00:00 2001 From: Samuel Paccoud - FUN MOOC Date: Tue, 6 Apr 2021 08:09:57 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B(all)=20fix=20get-pip=20url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The get-pip script has moved to a new address. --- .circleci/config.yml | 84 ++++++++++++++++++++++----- releases/dogwood/3/bare/Dockerfile | 2 +- releases/dogwood/3/fun/Dockerfile | 2 +- releases/eucalyptus/3/bare/Dockerfile | 2 +- releases/eucalyptus/3/wb/Dockerfile | 2 +- releases/hawthorn/1/bare/Dockerfile | 2 +- releases/hawthorn/1/oee/Dockerfile | 2 +- releases/ironwood/2/bare/Dockerfile | 2 +- releases/ironwood/2/oee/Dockerfile | 2 +- releases/master/0/bare/Dockerfile | 2 +- 10 files changed, 79 insertions(+), 23 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dcf568ac..348bd3a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -163,19 +163,33 @@ jobs: # # Note that the job name should match the EDX_RELEASE value - # No changes detected for dogwood.3-bare - # No changes detected for dogwood.3-fun - # No changes detected for eucalyptus.3-bare - # No changes detected for eucalyptus.3-wb - # No changes detected for hawthorn.1-bare + # Run jobs for the dogwood.3-bare release + dogwood.3-bare: + <<: [*defaults, *build_steps] + # Run jobs for the dogwood.3-fun release + dogwood.3-fun: + <<: [*defaults, *build_steps] + # Run jobs for the eucalyptus.3-bare release + eucalyptus.3-bare: + <<: [*defaults, *build_steps] + # Run jobs for the eucalyptus.3-wb release + eucalyptus.3-wb: + <<: [*defaults, *build_steps] + # Run jobs for the hawthorn.1-bare release + hawthorn.1-bare: + <<: [*defaults, *build_steps] # Run jobs for the hawthorn.1-oee release hawthorn.1-oee: <<: [*defaults, *build_steps] - # No changes detected for ironwood.2-bare + # Run jobs for the ironwood.2-bare release + ironwood.2-bare: + <<: [*defaults, *build_steps] # Run jobs for the ironwood.2-oee release ironwood.2-oee: <<: [*defaults, *build_steps] - # No changes detected for master.0-bare + # Run jobs for the master.0-bare release + master.0-bare: + <<: [*defaults, *build_steps] # Hub job hub: @@ -264,11 +278,41 @@ workflows: # Build jobs - # No changes detected so no job to run for dogwood.3-bare - # No changes detected so no job to run for dogwood.3-fun - # No changes detected so no job to run for eucalyptus.3-bare - # No changes detected so no job to run for eucalyptus.3-wb - # No changes detected so no job to run for hawthorn.1-bare + # Run jobs for the dogwood.3-bare release + - dogwood.3-bare: + requires: + - check-configuration + filters: + tags: + ignore: /.*/ + # Run jobs for the dogwood.3-fun release + - dogwood.3-fun: + requires: + - check-configuration + filters: + tags: + ignore: /.*/ + # Run jobs for the eucalyptus.3-bare release + - eucalyptus.3-bare: + requires: + - check-configuration + filters: + tags: + ignore: /.*/ + # Run jobs for the eucalyptus.3-wb release + - eucalyptus.3-wb: + requires: + - check-configuration + filters: + tags: + ignore: /.*/ + # Run jobs for the hawthorn.1-bare release + - hawthorn.1-bare: + requires: + - check-configuration + filters: + tags: + ignore: /.*/ # Run jobs for the hawthorn.1-oee release - hawthorn.1-oee: requires: @@ -276,7 +320,13 @@ workflows: filters: tags: ignore: /.*/ - # No changes detected so no job to run for ironwood.2-bare + # Run jobs for the ironwood.2-bare release + - ironwood.2-bare: + requires: + - check-configuration + filters: + tags: + ignore: /.*/ # Run jobs for the ironwood.2-oee release - ironwood.2-oee: requires: @@ -284,7 +334,13 @@ workflows: filters: tags: ignore: /.*/ - # No changes detected so no job to run for master.0-bare + # Run jobs for the master.0-bare release + - master.0-bare: + requires: + - check-configuration + filters: + tags: + ignore: /.*/ # We are pushing to Docker only images that are the result of a tag respecting the pattern: # **{branch-name}-x.y.z** diff --git a/releases/dogwood/3/bare/Dockerfile b/releases/dogwood/3/bare/Dockerfile index 15e99821..8162c1b8 100644 --- a/releases/dogwood/3/bare/Dockerfile +++ b/releases/dogwood/3/bare/Dockerfile @@ -42,7 +42,7 @@ RUN apt-get update && \ apt-get install -y curl # Download pip installer for python 2.7 -RUN curl -sLo get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py +RUN curl -sLo get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py # Download edxapp release # Get default EDX_RELEASE_REF value (defined on top) diff --git a/releases/dogwood/3/fun/Dockerfile b/releases/dogwood/3/fun/Dockerfile index e9eef00a..0d16d993 100644 --- a/releases/dogwood/3/fun/Dockerfile +++ b/releases/dogwood/3/fun/Dockerfile @@ -43,7 +43,7 @@ RUN apt-get update && \ apt-get install -y curl # Download pip installer for python 2.7 -RUN curl -sLo get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py +RUN curl -sLo get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py # Download edxapp release # Get default EDX_RELEASE_REF value (defined on top) diff --git a/releases/eucalyptus/3/bare/Dockerfile b/releases/eucalyptus/3/bare/Dockerfile index feadf4f7..b1633d33 100644 --- a/releases/eucalyptus/3/bare/Dockerfile +++ b/releases/eucalyptus/3/bare/Dockerfile @@ -42,7 +42,7 @@ RUN apt-get update && \ apt-get install -y curl # Download pip installer for python 2.7 -RUN curl -sLo get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py +RUN curl -sLo get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py # Download edxapp release # Get default EDX_RELEASE_REF value (defined on top) diff --git a/releases/eucalyptus/3/wb/Dockerfile b/releases/eucalyptus/3/wb/Dockerfile index fa3da0e3..c9cf748e 100644 --- a/releases/eucalyptus/3/wb/Dockerfile +++ b/releases/eucalyptus/3/wb/Dockerfile @@ -43,7 +43,7 @@ RUN apt-get update && \ apt-get install -y curl # Download pip installer for python 2.7 -RUN curl -sLo get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py +RUN curl -sLo get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py # Download edxapp release # Get default EDX_RELEASE_REF value (defined on top) diff --git a/releases/hawthorn/1/bare/Dockerfile b/releases/hawthorn/1/bare/Dockerfile index 1e5d7f5f..928c357e 100644 --- a/releases/hawthorn/1/bare/Dockerfile +++ b/releases/hawthorn/1/bare/Dockerfile @@ -40,7 +40,7 @@ RUN apt-get update && \ apt-get install -y curl # Download pip installer for python 2.7 -RUN curl -sLo get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py +RUN curl -sLo get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py # Download edxapp release # Get default EDX_RELEASE_REF value (defined on top) diff --git a/releases/hawthorn/1/oee/Dockerfile b/releases/hawthorn/1/oee/Dockerfile index c7dd9e16..ed3b792f 100644 --- a/releases/hawthorn/1/oee/Dockerfile +++ b/releases/hawthorn/1/oee/Dockerfile @@ -40,7 +40,7 @@ RUN apt-get update && \ apt-get install -y curl # Download pip installer for python 2.7 -RUN curl -sLo get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py +RUN curl -sLo get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py # Download edxapp release # Get default EDX_RELEASE_REF value (defined on top) diff --git a/releases/ironwood/2/bare/Dockerfile b/releases/ironwood/2/bare/Dockerfile index f5aa6c57..631e1f2e 100644 --- a/releases/ironwood/2/bare/Dockerfile +++ b/releases/ironwood/2/bare/Dockerfile @@ -40,7 +40,7 @@ RUN apt-get update && \ apt-get install -y curl # Download pip installer for python 2.7 -RUN curl -sLo get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py +RUN curl -sLo get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py # Download edxapp release # Get default EDX_RELEASE_REF value (defined on top) diff --git a/releases/ironwood/2/oee/Dockerfile b/releases/ironwood/2/oee/Dockerfile index 79fe75cf..8bcbc43f 100644 --- a/releases/ironwood/2/oee/Dockerfile +++ b/releases/ironwood/2/oee/Dockerfile @@ -40,7 +40,7 @@ RUN apt-get update && \ apt-get install -y curl # Download pip installer for python 2.7 -RUN curl -sLo get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py +RUN curl -sLo get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py # Download edxapp release # Get default EDX_RELEASE_REF value (defined on top) diff --git a/releases/master/0/bare/Dockerfile b/releases/master/0/bare/Dockerfile index 5be95ba7..fef10058 100644 --- a/releases/master/0/bare/Dockerfile +++ b/releases/master/0/bare/Dockerfile @@ -40,7 +40,7 @@ RUN apt-get update && \ apt-get install -y curl # Download pip installer for python 2.7 -RUN curl -sLo get-pip.py https://bootstrap.pypa.io/2.7/get-pip.py +RUN curl -sLo get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py # Download edxapp release # Get default EDX_RELEASE_REF value (defined on top)