diff options
| author | gjoranv <gv@yahoo-inc.com> | 2017-06-22 17:51:10 +0200 |
|---|---|---|
| committer | gjoranv <gv@yahoo-inc.com> | 2017-06-22 18:32:51 +0200 |
| commit | 379f54c2644e9aa3c678b240e57a225cce73fc06 (patch) | |
| tree | 2c6f58e93c54928703dfe5aaa946e2881ab51675 /docker | |
| parent | 966ad8da5bee6a0dd3e7f0516c228fb08ced2bf3 (diff) | |
Move Dockerfile and internal script for build to new build/ folder
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/build-vespa.sh | 4 | ||||
| -rw-r--r-- | docker/build/Dockerfile (renamed from docker/Dockerfile.build) | 0 | ||||
| -rwxr-xr-x | docker/build/build-vespa-internal.sh (renamed from docker/build-vespa-internal.sh) | 0 | ||||
| -rwxr-xr-x | docker/enter-build-container.sh | 2 | ||||
| -rwxr-xr-x | docker/vespa-ci.sh | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/docker/build-vespa.sh b/docker/build-vespa.sh index 18f20c552c3..37465ecb503 100755 --- a/docker/build-vespa.sh +++ b/docker/build-vespa.sh @@ -13,6 +13,6 @@ cd $DIR VESPA_VERSION=$1 DOCKER_IMAGE="vespabuild" -docker build -t "$DOCKER_IMAGE" -f Dockerfile.build . -docker run --rm -v $(pwd)/..:/vespa --entrypoint /vespa/docker/build-vespa-internal.sh "$DOCKER_IMAGE" "$VESPA_VERSION" "$(id -u)" "$(id -g)" +docker build -t "$DOCKER_IMAGE" -f build/Dockerfile . +docker run --rm -v $(pwd)/..:/vespa --entrypoint /vespa/docker/build/build-vespa-internal.sh "$DOCKER_IMAGE" "$VESPA_VERSION" "$(id -u)" "$(id -g)" diff --git a/docker/Dockerfile.build b/docker/build/Dockerfile index ad989969bc5..ad989969bc5 100644 --- a/docker/Dockerfile.build +++ b/docker/build/Dockerfile diff --git a/docker/build-vespa-internal.sh b/docker/build/build-vespa-internal.sh index d2216b049ca..d2216b049ca 100755 --- a/docker/build-vespa-internal.sh +++ b/docker/build/build-vespa-internal.sh diff --git a/docker/enter-build-container.sh b/docker/enter-build-container.sh index 7da3f98b070..677507088f4 100755 --- a/docker/enter-build-container.sh +++ b/docker/enter-build-container.sh @@ -12,6 +12,6 @@ cd $DIR DOCKER_IMAGE="vespabuild" -docker build -t "$DOCKER_IMAGE" -f Dockerfile.build . +docker build -t "$DOCKER_IMAGE" -f build/Dockerfile . docker run -ti --rm -v $(pwd)/..:/vespa --entrypoint /vespa/docker/enter-build-container-internal.sh "$DOCKER_IMAGE" diff --git a/docker/vespa-ci.sh b/docker/vespa-ci.sh index a70257ec2b1..1d7698e522d 100755 --- a/docker/vespa-ci.sh +++ b/docker/vespa-ci.sh @@ -16,7 +16,7 @@ GIT_COMMIT=$1 BUILD_DOCKER_IMAGE="vespabuild" CI_DOCKER_IMAGE="vespaci" -docker build -t "$BUILD_DOCKER_IMAGE" -f Dockerfile.build . +docker build -t "$BUILD_DOCKER_IMAGE" -f build/Dockerfile . # Create a temporary copy of the rpm spec file inside docker directory so it can be referenced by the Dockerfile rm -rf tmp; mkdir tmp |