Verified Commit 500ddf75 authored by Olivier Benz's avatar Olivier Benz
Browse files

Rename r-ver to base

parent d47d3430
......@@ -19,7 +19,7 @@
- >
export VERSION_MAJ_MIN_PAT=`sed -n
"s|.*R_VERSION=\([[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+\).*|\1|p"
r-ver/$CI_APP_TAG.Dockerfile | head -1`
base/$CI_APP_TAG.Dockerfile | head -1`
export VERSION_MAJ_MIN=`echo $VERSION_MAJ_MIN_PAT |
sed -n "s|\([[:digit:]]\+\.[[:digit:]]\+\).*|\1|p"`
......@@ -45,7 +45,7 @@ build:latest-linux-amd64:
- os:linux
script:
- >
cd r-ver && docker build --pull --build-arg NCPUS=$((`nproc`/2+1))
cd base && docker build --pull --build-arg NCPUS=$((`nproc`/2+1))
-t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
-t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-linux-amd64
-f $CI_APP_TAG.Dockerfile .
......@@ -59,7 +59,7 @@ build:latest-linux-amd64:
rules:
- if: $CI_COMMIT_BRANCH == "master" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
changes:
- r-ver/latest.Dockerfile
- base/latest.Dockerfile
build:latest-linux-arm64v8:
extends: .build
......@@ -68,7 +68,7 @@ build:latest-linux-arm64v8:
- os:linux
script:
- >
cd r-ver && docker build --pull --build-arg NCPUS=$((`nproc`/2+1))
cd base && docker build --pull --build-arg NCPUS=$((`nproc`/2+1))
-t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
-t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-linux-arm64v8
-f $CI_APP_TAG.Dockerfile .
......@@ -82,7 +82,7 @@ build:latest-linux-arm64v8:
rules:
- if: $CI_COMMIT_BRANCH == "master" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
changes:
- r-ver/latest.Dockerfile
- base/latest.Dockerfile
build:version-linux-amd64:
extends: .build
......@@ -91,7 +91,7 @@ build:version-linux-amd64:
- os:linux
script:
- >
cd r-ver && docker build --pull --build-arg NCPUS=$((`nproc`/2+1))
cd base && docker build --pull --build-arg NCPUS=$((`nproc`/2+1))
-t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
-f $CI_APP_TAG.Dockerfile .
- |
......@@ -105,7 +105,7 @@ build:version-linux-amd64:
rules:
- if: $CI_COMMIT_BRANCH == "freeze-version" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
changes:
- r-ver/4.1.3.Dockerfile
- base/4.1.3.Dockerfile
build:version-linux-arm64v8:
extends: .build
......@@ -114,7 +114,7 @@ build:version-linux-arm64v8:
- os:linux
script:
- >
cd r-ver && docker build --pull --build-arg NCPUS=$((`nproc`/2+1))
cd base && docker build --pull --build-arg NCPUS=$((`nproc`/2+1))
-t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
-f $CI_APP_TAG.Dockerfile .
- |
......@@ -128,7 +128,7 @@ build:version-linux-arm64v8:
rules:
- if: $CI_COMMIT_BRANCH == "freeze-version" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
changes:
- r-ver/4.1.3.Dockerfile
- base/4.1.3.Dockerfile
build-manifest:latest-linux-multiarch:
extends: .build
......@@ -186,7 +186,7 @@ build-manifest:latest-linux-multiarch:
rules:
- if: $CI_COMMIT_BRANCH == "master"
changes:
- r-ver/latest.Dockerfile
- base/latest.Dockerfile
build-manifest:version-linux-multiarch:
extends: .build
......@@ -211,7 +211,7 @@ build-manifest:version-linux-multiarch:
rules:
- if: $CI_COMMIT_BRANCH == "freeze-version"
changes:
- r-ver/4.1.3.Dockerfile
- base/4.1.3.Dockerfile
trigger-latest-build:
extends: .build
......@@ -224,7 +224,7 @@ trigger-latest-build:
rules:
- if: $CI_COMMIT_REF_NAME == "master"
changes:
- r-ver/latest.Dockerfile
- base/latest.Dockerfile
trigger-version-build:
extends: .build
......@@ -237,4 +237,4 @@ trigger-version-build:
rules:
- if: $CI_COMMIT_REF_NAME == "freeze-version"
changes:
- r-ver/4.1.3.Dockerfile
- base/4.1.3.Dockerfile
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment