Update image builds

- Update 3rd party notices
Azure · Apr 26, 2021 · 5681bfb · 5681bfb
1 parent 3b23665
commit 5681bfb
Show file tree

Hide file tree

Showing 6 changed files with 224 additions and 169 deletions.
diff --git a/.vsts/pipeline-replicate-singularity.yml b/.vsts/pipeline-replicate-singularity.yml
@@ -1,7 +1,7 @@
 name: $(SourceBranch)$(Rev:.r)
 
 jobs:
-  - job: Replicate Singularity Images
+  - job: Replicate-Singularity-Images
     pool:
       vmImage: ubuntu-20.04
     steps:

diff --git a/THIRD_PARTY_NOTICES.txt b/THIRD_PARTY_NOTICES.txt
diff --git a/images/docker/linux/cli/Dockerfile b/images/docker/linux/cli/Dockerfile
@@ -1,24 +1,27 @@
 # Dockerfile for Azure/batch-shipyard (cli)
 
-FROM alpine:3.10
+FROM python:3.9.4-alpine3.13
 MAINTAINER Fred Park <https://github.com/Azure/batch-shipyard>
 
 ARG GIT_BRANCH
 ARG GIT_COMMIT
 
 RUN apk update \
     && apk add --update --no-cache \
-        musl build-base python3 python3-dev openssl-dev libffi-dev \
-        ca-certificates openssl openssh-client rsync git bash \
+        musl build-base openssl-dev libffi-dev rust cargo ca-certificates git \
+        openssl openssh-client rsync bash \
+    && python3 -m ensurepip --upgrade \
+    && pip3 install --no-cache-dir --upgrade pip setuptools setuptools-rust wheel \
     && git clone -b $GIT_BRANCH --single-branch https://github.com/Azure/batch-shipyard.git /opt/batch-shipyard \
     && cd /opt/batch-shipyard \
     && git checkout $GIT_COMMIT \
     && rm -rf .git .github .vsts \
     && rm -f .git* .travis.yml *.yml install* \
-    && python3 -m pip install --no-cache-dir --upgrade pip \
     && pip3 install --no-cache-dir -r requirements.txt \
     && python3 -m compileall -f /opt/batch-shipyard/shipyard.py /opt/batch-shipyard/convoy \
-    && apk del --purge build-base python3-dev openssl-dev libffi-dev git \
+    && pip3 uninstall -y setuptools-rust wheel \
+    && apk del --purge build-base patch openssl-dev libffi-dev rust cargo git \
     && rm /var/cache/apk/*
+    && rm -rf /root/.cache /root/.cargo
 
 ENTRYPOINT ["/opt/batch-shipyard/shipyard.py"]
diff --git a/images/docker/windows/cli/Dockerfile b/images/docker/windows/cli/Dockerfile
@@ -1,7 +1,7 @@
 # Dockerfile for Azure/batch-shipyard CLI (Windows)
 # Adapted from: https://github.com/StefanScherer/dockerfiles-windows/blob/master/python/Dockerfile
 
-FROM python:3.7.5-windowsservercore-ltsc2016
+FROM python:3.9.4-windowsservercore-ltsc2016
 MAINTAINER Fred Park <https://github.com/Azure/batch-shipyard>
 
 ENV chocolateyUseWindowsCompression false
@@ -35,8 +35,8 @@ COPY --from=0 /batch-shipyard /batch-shipyard
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV PYTHON_VERSION 3.7.5
-ENV PYTHON_PIP_VERSION 19.3.1
+ENV PYTHON_VERSION 3.9.4
+ENV PYTHON_PIP_VERSION 21.0.1
 
 RUN $env:PATH = 'C:\Python;C:\Python\Scripts;{0}' -f $env:PATH ; \
     Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $env:PATH ; \

diff --git a/images/gen_3rd_party_notices.sh b/images/gen_3rd_party_notices.sh
@@ -27,12 +27,6 @@ DEPENDENCIES=(
     click
     https://github.com/pallets/click
     https://github.com/pallets/click/raw/master/LICENSE.rst
-    future
-    https://github.com/PythonCharmers/python-future
-    https://github.com/PythonCharmers/python-future/raw/master/LICENSE.txt
-    libtorrent
-    https://github.com/arvidn/libtorrent
-    https://github.com/arvidn/libtorrent/raw/libtorrent-1_0_11/LICENSE
     msrest
     https://github.com/Azure/msrest-for-python
     https://github.com/Azure/msrest-for-python/raw/master/LICENSE.md
@@ -52,11 +46,11 @@ DEPENDENCIES=(
     https://github.com/requests/requests
     https://github.com/requests/requests/raw/master/LICENSE
     ruamel.yaml
-    https://bitbucket.org/ruamel/yaml
-    https://bitbucket.org/ruamel/yaml/raw/75c831644aa26f12ff33ac81180fbaa23b81d4bb/LICENSE
+    https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree/
+    "https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree/LICENSE?format=raw"
     singularity
-    https://github.com/sylabs/singularity
-    https://github.com/sylabs/singularity/raw/master/LICENSE.md
+    https://github.com/hpcng/singularity
+    https://github.com/hpcng/singularity/raw/master/LICENSE.md
 )
 DEPLEN=${#DEPENDENCIES[@]}
 

diff --git a/images/singularity/cli.def b/images/singularity/cli.def
@@ -1,21 +1,24 @@
 # Singularity for Azure/batch-shipyard (cli)
 
 Bootstrap: library
-From: alpine:3.9
+From: alpine:3.13
 
 %post
 apk update
 apk add --update --no-cache \
-    musl build-base python3 python3-dev openssl-dev libffi-dev \
-    ca-certificates openssl openssh-client rsync git bash
+    musl build-base openssl-dev libffi-dev rust cargo ca-certificates git
+python3 -m ensurepip --upgrade
+pip3 install --no-cache-dir --upgrade pip setuptools setuptools-rust wheel
 git clone -b master --single-branch --depth 5 https://github.com/Azure/batch-shipyard.git /opt/batch-shipyard
 cd /opt/batch-shipyard
 rm -rf .git .github .vsts
 rm -f .git* .travis.yml *.yml install*
 pip3 install --no-cache-dir -r requirements.txt
 python3 -m compileall -f /opt/batch-shipyard/shipyard.py /opt/batch-shipyard/convoy
-apk del --purge build-base python3-dev openssl-dev libffi-dev git
+pip3 uninstall -y setuptools-rust wheel
+apk del --purge build-base patch openssl-dev libffi-dev rust cargo git
 rm /var/cache/apk/*
+rm -rf /root/.cache /root/.cargo
 
 %runscript
 exec /opt/batch-shipyard/shipyard.py "$@"