Commit 0ddadbab authored by Lukas Riedel's avatar Lukas Riedel

Revert "Revert "Move Dockerfiles into new docker/ directory and add file extensions""

This reverts commit 2971b6d1.
parent 2971b6d1
......@@ -39,7 +39,7 @@ setup:dune-env:
before_script:
- $DOCKER_LOGIN
script:
- docker build --build-arg PROCNUM=$CPUS_DIND -f dockerfiles/dune-env -t $DUNE_ENV_IMAGE .
- docker build -f docker/dune-env.dockerfile --build-arg PROCNUM=$CPUS_DIND -t $DUNE_ENV_IMAGE .
- docker push $DUNE_ENV_IMAGE
prep:update-dune:
......@@ -57,7 +57,7 @@ prep:update-dune:
before_script:
- $DOCKER_LOGIN
script:
- docker build --build-arg PROCNUM=$CPUS_DIND -f dockerfiles/dune-env-update -t $DUNE_ENV_IMAGE .
- docker build -f docker/dune-env-update.dockerfile --build-arg PROCNUM=$CPUS_DIND -t $DUNE_ENV_IMAGE .
- docker push $DUNE_ENV_IMAGE
build:main:
......@@ -172,7 +172,7 @@ deploy:dockerhub-devel:
before_script:
- $DOCKER_LOGIN
script:
- docker build --build-arg PROCNUM=$CPUS_DIND -f dockerfiles/dorie -t dorie/dorie:devel .
- docker build -f docker/dorie.dockerfile --build-arg PROCNUM=$CPUS_DIND -t dorie/dorie:devel .
- docker push dorie/dorie:devel
deploy:dockerhub-stable:
......@@ -189,5 +189,5 @@ deploy:dockerhub-stable:
before_script:
- $DOCKER_LOGIN
script:
- docker build --build-arg PROCNUM=$CPUS_DIND -f dockerfiles/dorie -t dorie/dorie:$CI_COMMIT_TAG .
- docker build -f docker/dorie.dockerfile --build-arg PROCNUM=$CPUS_DIND -t dorie/dorie:$CI_COMMIT_TAG .
- docker push dorie/dorie:$CI_COMMIT_TAG
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