Skip to content

Commit 06e8d1c

Browse files
committed
fix azure docker
Signed-off-by: Sun, Xuehao <xuehao.sun@intel.com>
1 parent f21f5a4 commit 06e8d1c

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.azure-pipelines/docker/Dockerfile.devel

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
3434

3535
RUN ln -sf $(which python3) /usr/bin/python
3636

37-
ARG USER_ID=1000
38-
ARG GROUP_ID=1000
37+
ARG USER_ID=1001
38+
ARG GROUP_ID=1001
3939

4040
RUN groupadd -g ${GROUP_ID} hostgroup && \
4141
useradd -m -u ${USER_ID} -g ${GROUP_ID} hostuser
4242

4343
USER hostuser
4444

45-
RUN python -m pip install --no-cache-dir --upgrade pip
46-
RUN python -m pip install --no-cache-dir setuptools
45+
RUN pip install --user --no-cache-dir --upgrade pip
46+
RUN pip install --user --no-cache-dir setuptools
4747

4848
RUN pip list
4949

.azure-pipelines/ut-3x-pt.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ stages:
6969
steps:
7070
- script: |
7171
if [[ ! $(docker images | grep -i ${IMAGE_NAME}:${IMAGE_TAG}) ]]; then
72-
docker build --build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) -f ${BUILD_SOURCESDIRECTORY}/.azure-pipelines/docker/Dockerfile.devel -t ${IMAGE_NAME}:${IMAGE_TAG} .
72+
docker build -f ${BUILD_SOURCESDIRECTORY}/.azure-pipelines/docker/Dockerfile.devel -t ${IMAGE_NAME}:${IMAGE_TAG} .
7373
fi
7474
docker images | grep -i ${IMAGE_NAME}
7575
if [[ $? -ne 0 ]]; then

.azure-pipelines/ut-3x-tf.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ stages:
6666
steps:
6767
- script: |
6868
if [[ ! $(docker images | grep -i ${IMAGE_NAME}:${IMAGE_TAG}) ]]; then
69-
docker build --build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) -f ${BUILD_SOURCESDIRECTORY}/.azure-pipelines/docker/Dockerfile.devel -t ${IMAGE_NAME}:${IMAGE_TAG} .
69+
docker build -f ${BUILD_SOURCESDIRECTORY}/.azure-pipelines/docker/Dockerfile.devel -t ${IMAGE_NAME}:${IMAGE_TAG} .
7070
fi
7171
docker images | grep -i ${IMAGE_NAME}
7272
if [[ $? -ne 0 ]]; then

.azure-pipelines/ut-basic.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ stages:
240240
steps:
241241
- script: |
242242
if [[ ! $(docker images | grep -i ${IMAGE_NAME}:${IMAGE_TAG}) ]]; then
243-
docker build --build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) -f ${BUILD_SOURCESDIRECTORY}/.azure-pipelines/docker/Dockerfile.devel -t ${IMAGE_NAME}:${IMAGE_TAG} .
243+
docker build -f ${BUILD_SOURCESDIRECTORY}/.azure-pipelines/docker/Dockerfile.devel -t ${IMAGE_NAME}:${IMAGE_TAG} .
244244
fi
245245
docker images | grep -i ${IMAGE_NAME}
246246
if [[ $? -ne 0 ]]; then

0 commit comments

Comments
 (0)