summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/getting_started.md4
-rw-r--r--scripts/command/docker-build15
-rw-r--r--scripts/command/docker-configure10
-rw-r--r--scripts/command/docker-nncc (renamed from scripts/command/docker-test)2
4 files changed, 3 insertions, 28 deletions
diff --git a/doc/getting_started.md b/doc/getting_started.md
index cc7229fc0..685f5af45 100644
--- a/doc/getting_started.md
+++ b/doc/getting_started.md
@@ -44,9 +44,9 @@ nncc$ cat Dockerfile | docker build --build-arg HTTP_PROXY --build-arg HTTPS_PRO
One may easily build _nncc_ with the following command once ``nncc`` docker image is built.
```
-nncc$ ./nncc docker-configure
+nncc$ ./nncc docker-nncc configure
...
-nncc$ ./nncc docker-build
+nncc$ ./nncc docker-nncc build
...
```
diff --git a/scripts/command/docker-build b/scripts/command/docker-build
deleted file mode 100644
index 2da6db104..000000000
--- a/scripts/command/docker-build
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-source "${NNCC_SCRIPT_PATH}/docker.configuration"
-
-BUILD_RESULT=0
-
- if [[ ${BUILD_RESULT} -eq 0 ]]; then
- CMD="./nncc build -j$(nproc)"
- docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME $CMD
- BUILD_RESULT=$?
- fi
-
-docker_cleanup
-
-exit $BUILD_RESULT
diff --git a/scripts/command/docker-configure b/scripts/command/docker-configure
deleted file mode 100644
index 9329f549b..000000000
--- a/scripts/command/docker-configure
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-source "${NNCC_SCRIPT_PATH}/docker.configuration"
-
-docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME /bin/bash nncc configure "$@"
-EXITCODE=$?
-
-docker_cleanup
-
-exit $EXITCODE
diff --git a/scripts/command/docker-test b/scripts/command/docker-nncc
index cf579e7cb..143a280ea 100644
--- a/scripts/command/docker-test
+++ b/scripts/command/docker-nncc
@@ -2,7 +2,7 @@
source "${NNCC_SCRIPT_PATH}/docker.configuration"
-docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME /bin/bash nncc test "$@"
+docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME ./nncc "$@"
EXITCODE=$?
docker_cleanup