Commit 4e7bc9db authored by jdgleaver's avatar jdgleaver
Browse files

Disable building of container with pre-compiled MXE toolchain (currently...

Disable building of container with pre-compiled MXE toolchain (currently unused, and source repo is down)
parent bbde7f95
Pipeline #10031 passed with stage
in 332 minutes and 17 seconds
......@@ -7,8 +7,8 @@ docker-build-master:
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
- docker build --pull -t "$CI_REGISTRY_IMAGE" --build-arg NUMPROC=$(($(nproc)/5)) .
- docker push "$CI_REGISTRY_IMAGE"
#- docker build --pull -t "$CI_REGISTRY_IMAGE" --build-arg NUMPROC=$(($(nproc)/5)) .
#- docker push "$CI_REGISTRY_IMAGE"
- docker build --pull -t "$CI_REGISTRY_IMAGE:gcc10" --build-arg NUMPROC=$(($(nproc)/5)) --file Dockerfile.gcc10 .
- docker push "$CI_REGISTRY_IMAGE:gcc10"
only:
......@@ -23,8 +23,8 @@ docker-build:
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" --build-arg NUMPROC=$(($(nproc)/5)) .
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
#- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" --build-arg NUMPROC=$(($(nproc)/5)) .
#- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-gcc10" --build-arg NUMPROC=$(($(nproc)/5)) --file Dockerfile.gcc10 .
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-gcc10"
except:
......
Markdown is supported
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