Skip to content

Commit 216022b

Browse files
saimidusaimidu
authored
update: Update buildspec for PyTorch 1.3.1 (#30)
* Modify dockerfiles for new build context * Change path of all docker build artifacts * Change build context to folder containing dockerfiles * Modify buildspec.yml to build latest images with modified build context
1 parent 4f0b3e4 commit 216022b

14 files changed

+26
-78
lines changed

‎buildspec.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,28 @@ phases:
4040
# create wheel in dist/
4141
- python3 setup.py bdist_wheel
4242
- whl_name=$(ls dist/sagemaker_pytorch_serving_container*.whl)
43-
- cp $whl_name sagemaker_pytorch_serving_container-1.2-py2.py3-none-any.whl
43+
- cp $whl_name sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl
4444

4545
- cpu_dockerfile="Dockerfile.cpu"
4646
- gpu_dockerfile="Dockerfile.gpu"
4747

4848
# build py2 images
4949
- build_dir="docker/$FRAMEWORK_VERSION/py$CPU_PY2_VERSION"
50+
- cp sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl $build_dir/
51+
- cp -r docker/build_artifacts/* $build_dir/
5052
- CPU_PY2_TAG="$FRAMEWORK_VERSION-cpu-py2-$BUILD_ID"
5153
- GPU_PY2_TAG="$FRAMEWORK_VERSION-gpu-py2-$BUILD_ID"
52-
- docker build -f "$build_dir/$cpu_dockerfile" --build-arg py_version=2 -t $PREPROD_IMAGE:$CPU_PY2_TAG .
53-
- docker build -f "$build_dir/$gpu_dockerfile" --build-arg py_version=2 -t $PREPROD_IMAGE:$GPU_PY2_TAG .
54+
- docker build -f "$build_dir/$cpu_dockerfile" -t $PREPROD_IMAGE:$CPU_PY2_TAG $build_dir
55+
- docker build -f "$build_dir/$gpu_dockerfile" -t $PREPROD_IMAGE:$GPU_PY2_TAG $build_dir
5456

5557
# build py3 image
5658
- build_dir="docker/$FRAMEWORK_VERSION/py$GPU_PY3_VERSION"
59+
- cp sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl $build_dir/
60+
- cp -r docker/build_artifacts/* $build_dir/
5761
- CPU_PY3_TAG="$FRAMEWORK_VERSION-cpu-py3-$BUILD_ID"
5862
- GPU_PY3_TAG="$FRAMEWORK_VERSION-gpu-py3-$BUILD_ID"
59-
- docker build -f "$build_dir/$cpu_dockerfile" --build-arg py_version=3 -t $PREPROD_IMAGE:$CPU_PY3_TAG .
60-
- docker build -f "$build_dir/$gpu_dockerfile" --build-arg py_version=3 -t $PREPROD_IMAGE:$GPU_PY3_TAG .
63+
- docker build -f "$build_dir/$cpu_dockerfile" -t $PREPROD_IMAGE:$CPU_PY3_TAG $build_dir
64+
- docker build -f "$build_dir/$gpu_dockerfile" -t $PREPROD_IMAGE:$GPU_PY3_TAG $build_dir
6165

6266
# push images to ecr
6367
- $(aws ecr get-login --registry-ids $ACCOUNT --no-include-email --region $AWS_DEFAULT_REGION)

‎docker/1.3.1/py2/Dockerfile.cpu‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ RUN useradd -m model-server \
7272
&& mkdir -p /home/model-server/tmp \
7373
&& chown -R model-server /home/model-server
7474

75-
COPY docker/$PYTORCH_VERSION/py2/mms-entrypoint.py /usr/local/bin/dockerd-entrypoint.py
76-
COPY docker/$PYTORCH_VERSION/py2/config.properties /home/model-server
77-
COPY src/sagemaker_pytorch_serving_container/deep_learning_container.py /usr/local/bin/deep_learning_container.py
75+
COPY mms-entrypoint.py /usr/local/bin/dockerd-entrypoint.py
76+
COPY config.properties /home/model-server
77+
COPY deep_learning_container.py /usr/local/bin/deep_learning_container.py
7878

7979
RUN chmod +x /usr/local/bin/dockerd-entrypoint.py \
8080
&& chmod +x /usr/local/bin/deep_learning_container.py
8181

82-
COPY dist/sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl /sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl
82+
COPY sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl /sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl
8383
RUN pip install --no-cache-dir \
8484
/sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl \
8585
&& rm /sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl

‎docker/1.3.1/py2/Dockerfile.gpu‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ RUN useradd -m model-server \
8686
&& mkdir -p /home/model-server/tmp \
8787
&& chown -R model-server /home/model-server
8888

89-
COPY docker/$PYTORCH_VERSION/py2/mms-entrypoint.py /usr/local/bin/dockerd-entrypoint.py
90-
COPY docker/$PYTORCH_VERSION/py2/config.properties /home/model-server
91-
COPY src/sagemaker_pytorch_serving_container/deep_learning_container.py /usr/local/bin/deep_learning_container.py
89+
COPY mms-entrypoint.py /usr/local/bin/dockerd-entrypoint.py
90+
COPY config.properties /home/model-server
91+
COPY deep_learning_container.py /usr/local/bin/deep_learning_container.py
9292

9393
RUN chmod +x /usr/local/bin/dockerd-entrypoint.py \
9494
&& chmod +x /usr/local/bin/deep_learning_container.py
@@ -103,7 +103,7 @@ RUN apt-get install -y --no-install-recommends \
103103

104104
# RUN pip install --no-cache-dir 'opencv-python>=4.0,<4.1'
105105

106-
COPY dist/sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl /sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl
106+
COPY sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl /sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl
107107
RUN pip install --no-cache-dir \
108108
/sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl \
109109
&& rm /sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl

‎docker/1.3.1/py3/Dockerfile.cpu‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ RUN useradd -m model-server \
7171
&& mkdir -p /home/model-server/tmp \
7272
&& chown -R model-server /home/model-server
7373

74-
COPY docker/$PYTORCH_VERSION/py3/mms-entrypoint.py /usr/local/bin/dockerd-entrypoint.py
75-
COPY docker/$PYTORCH_VERSION/py3/config.properties /home/model-server
76-
COPY src/sagemaker_pytorch_serving_container/deep_learning_container.py /usr/local/bin/deep_learning_container.py
74+
COPY mms-entrypoint.py /usr/local/bin/dockerd-entrypoint.py
75+
COPY config.properties /home/model-server
76+
COPY deep_learning_container.py /usr/local/bin/deep_learning_container.py
7777

7878
RUN chmod +x /usr/local/bin/dockerd-entrypoint.py \
7979
&& chmod +x /usr/local/bin/deep_learning_container.py
8080

81-
COPY dist/sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl /sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl
81+
COPY sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl /sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl
8282
RUN pip install --no-cache-dir \
8383
/sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl \
8484
&& rm /sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl

‎docker/1.3.1/py3/Dockerfile.gpu‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ RUN useradd -m model-server \
8888
&& mkdir -p /home/model-server/tmp \
8989
&& chown -R model-server /home/model-server
9090

91-
COPY docker/$PYTORCH_VERSION/py3/mms-entrypoint.py /usr/local/bin/dockerd-entrypoint.py
92-
COPY docker/$PYTORCH_VERSION/py3/config.properties /home/model-server
93-
COPY src/sagemaker_pytorch_serving_container/deep_learning_container.py /usr/local/bin/deep_learning_container.py
91+
COPY mms-entrypoint.py /usr/local/bin/dockerd-entrypoint.py
92+
COPY config.properties /home/model-server
93+
COPY deep_learning_container.py /usr/local/bin/deep_learning_container.py
9494

9595
RUN chmod +x /usr/local/bin/dockerd-entrypoint.py \
9696
&& chmod +x /usr/local/bin/deep_learning_container.py
9797

98-
COPY dist/sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl /sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl
98+
COPY sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl /sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl
9999
RUN pip install --no-cache-dir \
100100
/sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl \
101101
&& rm /sagemaker_pytorch_serving_container-1.3-py2.py3-none-any.whl

‎docker/1.3.1/py3/config.properties‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎docker/1.3.1/py3/mms-entrypoint.py‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎docker/__init__.py‎

Whitespace-only changes.

‎lib/changehostname.c‎ renamed to ‎docker/build_artifacts/changehostname.c‎

File renamed without changes.

‎docker/1.3.1/py2/config.properties‎ renamed to ‎docker/build_artifacts/config.properties‎

File renamed without changes.

0 commit comments

Comments
 (0)