rebuilt

Dockerfile

@@ -2,35 +2,86 @@ ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
 ARG BASE_TAG=8.4
 
+FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as build
+
+RUN dnf upgrade -y --nodocs && \
+    dnf install -y --nodocs \
+       bzip2-devel \
+       expat-devel \
+       gcc \
+       libffi-devel \
+       libuuid-devel \
+       make \
+       openssl-devel \
+       sqlite-devel \
+       xz-devel && \
+    dnf clean all && \
+    rm -rf /var/cache/dnf
+
+COPY python.tar.gz /
+
+RUN mkdir -p /usr/local/src/python && \
+    tar -xzvf python.tar.gz -C /usr/local/src/python --strip-components=1 && \
+    cd /usr/local/src/python && \
+    ./configure \
+      --enable-loadable-sqlite-extensions \
+      --enable-optimizations \
+      --enable-option-checking=fatal \
+      --enable-shared \
+      --with-system-expat \
+      --with-ensurepip && \
+    make && \
+    make altinstall
+
+RUN find /usr/local -depth \
+	\( \
+		\( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
+		-o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
+	\) -exec rm -rf '{}' + && \
+    echo '/usr/local/lib' > /etc/ld.so.conf && \
+    ldconfig
+
+COPY pip-21.1.2-py3-none-any.whl /
+COPY setuptools-56.1.0-py3-none-any.whl /
+COPY wheel-0.36.2-py2.py3-none-any.whl /
+
+RUN python3.6 -m pip install --no-index --upgrade /pip-21.1.2-py3-none-any.whl && \
+    python3.6 -m pip install --no-index --upgrade /setuptools-56.1.0-py3-none-any.whl && \
+    python3.6 -m pip install --no-index --upgrade /wheel-0.36.2-py2.py3-none-any.whl
+
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-COPY python.tar.gz pip-21.0.1-py3-none-any.whl /opt
-
-ENV PATH=/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/python
-
-RUN dnf upgrade -y && \
-    dnf install -y make gcc openssl-devel bzip2-devel libffi-devel && \
-    cd /opt && \
-    mkdir /opt/python && \
-    tar -xzf python.tar.gz --strip-components=1 -C /opt/python && \
-    rm -f python.tar.gz && \
-    cd python && \
-    ./configure --enable-optimizations && \
-    make altinstall && \
-    python -m pip install --no-index --upgrade /opt/pip-21.0.1-py3-none-any.whl && \
-    ln -s /opt/python/python /usr/bin/python3 && \
-    rm -f /opt/pip-21.0.1-py3-none-any.whl && \
-    dnf -y remove gcc make openssl-devel bzip2-devel libffi-devel && \
-    find /opt/python -name "*.pem" -o -name "*.key" | xargs rm -f && \
-    find /usr/local/lib/python3.6/test -name "*.pem" -o -name "*.key" | xargs rm -f && \
+RUN dnf update -y --nodocs && \
     dnf clean all && \
     rm -rf /var/cache/dnf
 
-RUN groupadd -g 1001 python3 && \
-    useradd -r -u 1001 -m -s /sbin/nologin -g python3 python3
+#ENV PATH /usr/local/bin:$PATH
 
-USER python3
+COPY --from=build /usr/local/include/python3.6 /usr/local/include/python3.6
+COPY --from=build /usr/local/lib /usr/local/lib
+COPY --from=build /usr/local/bin /usr/local/bin
 
-HEALTHCHECK none
+RUN cd /usr/local/bin && \
+    ln -s idle3.6 idle3 && \
+    ln -s idle3 idle && \
+    ln -s pydoc3.6 pydoc3 && \
+    ln -s pydoc3 pydoc && \
+    ln -s python3.6 python3 && \
+    ln -s python3 python && \
+    ln -s python3.6-config python3-config && \
+    ln -s python3-config python-config && \
+    ln -s easy_install-3.6 easy_install-3 && \
+    ln -s easy_install-3 easy_install && \
+    ln -s 2to3-3.6 2to3-3 && \
+    ln -s 2to3-3 2to3 && \
+    echo '/usr/local/lib' > /etc/ld.so.conf && \
+    ldconfig
+
+RUN groupadd -g 1001 python && \
+    useradd -r -u 1001 -m -s /sbin/nologin -g python python
+
+USER 1001
 
 CMD ["python3"]
+
+HEALTHCHECK NONE

LICENSE

-PSF LICENSE AGREEMENT FOR PYTHON 3.6.12
+PSF LICENSE AGREEMENT FOR PYTHON 3.6.13
 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and
    the Individual or Organization ("Licensee") accessing and otherwise using Python
-   3.6.12 software in source or binary form and its associated documentation.
+   3.6.13 software in source or binary form and its associated documentation.
 
 2. Subject to the terms and conditions of this License Agreement, PSF hereby
    grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
    analyze, test, perform and/or display publicly, prepare derivative works,
-   distribute, and otherwise use Python 3.6.12 alone or in any derivative
+   distribute, and otherwise use Python 3.6.13 alone or in any derivative
    version, provided, however, that PSF's License Agreement and PSF's notice of
    copyright, i.e., "Copyright © 2001-2020 Python Software Foundation; All Rights
-   Reserved" are retained in Python 3.6.12 alone or in any derivative version
+   Reserved" are retained in Python 3.6.13 alone or in any derivative version
    prepared by Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on or
-   incorporates Python 3.6.12 or any part thereof, and wants to make the
+   incorporates Python 3.6.13 or any part thereof, and wants to make the
    derivative work available to others as provided herein, then Licensee hereby
    agrees to include in any such work a brief summary of the changes made to Python
-   3.6.12.
+   3.6.13.
 
-4. PSF is making Python 3.6.12 available to Licensee on an "AS IS" basis.
+4. PSF is making Python 3.6.13 available to Licensee on an "AS IS" basis.
    PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.  BY WAY OF
    EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR
    WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
-   USE OF PYTHON 3.6.12 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+   USE OF PYTHON 3.6.13 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
 
-5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 3.6.12
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 3.6.13
    FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
-   MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 3.6.12, OR ANY DERIVATIVE
+   MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 3.6.13, OR ANY DERIVATIVE
    THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
 
 6. This License Agreement will automatically terminate upon a material breach of
@@ -38,5 +38,5 @@ PSF LICENSE AGREEMENT FOR PYTHON 3.6.12
    trademark sense to endorse or promote products or services of Licensee, or any
    third party.
 
-8. By copying, installing or otherwise using Python 3.6.12, Licensee agrees
+8. By copying, installing or otherwise using Python 3.6.13, Licensee agrees
    to be bound by the terms and conditions of this License Agreement.

README.md

@@ -4,5 +4,5 @@ Python is developed under an OSI-approved open source license, making it freely
 Connect to [https://www.python.org/](https://www.python.org/)for complete details about Python.
 
 # More resources
-[Python 3.6.12 Online Documentation](Python 3.6.12)
+[Python 3.6.13 Online Documentation](Python 3.6.13)
 Report bugs at [https://bugs.python.org](https://bugs.python.org).

hardening_manifest.yaml

@@ -31,19 +31,29 @@ labels:
 # List of resources to make available to the offline build context
 resources:
 - filename: python.tar.gz
-  url: https://github.com/python/cpython/archive/v3.6.13.tar.gz
+  url: https://github.com/python/cpython/archive/refs/tags/v3.6.13.tar.gz
   validation:
     type: sha256
     value: 22cb6086b79c2408e7c5c2109349f6365160263fb18209ff0d144678c7882ff4
-- filename: pip-21.0.1-py3-none-any.whl
-  url: https://files.pythonhosted.org/packages/fe/ef/60d7ba03b5c442309ef42e7d69959f73aacccd0d86008362a681c4698e83/pip-21.0.1-py3-none-any.whl
+- filename: pip-21.1.2-py3-none-any.whl
+  url: https://files.pythonhosted.org/packages/cd/82/04e9aaf603fdbaecb4323b9e723f13c92c245f6ab2902195c53987848c78/pip-21.1.2-py3-none-any.whl
   validation:
     type: sha256
-    value: 37fd50e056e2aed635dec96594606f0286640489b0db0ce7607f7e51890372d5
+    value: f8ea1baa693b61c8ad1c1d8715e59ab2b93cd3c4769bacab84afcc4279e7a70e
+- filename: setuptools-56.1.0-py3-none-any.whl
+  url: https://files.pythonhosted.org/packages/11/1b/7012b145cb228aed20f9b2b8b259df49e7963d900799ea44791f54d06ab9/setuptools-56.1.0-py3-none-any.whl
+  validation:
+    type: sha256
+    value: 9ceb15de17f8e99dd4903f88e05e04285fa60f364f67bdcc4334aa71604b7a39
+- filename: wheel-0.36.2-py2.py3-none-any.whl
+  url: https://files.pythonhosted.org/packages/65/63/39d04c74222770ed1589c0eaba06c05891801219272420b40311cd60c880/wheel-0.36.2-py2.py3-none-any.whl
+  validation:
+    type: sha256
+    value: 78b5b185f0e5763c26ca1e324373aadd49182ca90e825f7853f4b2509215dc0e
 
 # List of project maintainers
 maintainers:
 - email: "melissari_sean@bah.com"
   name: "Sean Melissari"
   username: "smelissari"
-  cht_member: true 
+  cht_member: true

renovate.json

 {
   "assignees": [
-    "@sean.melissari"
+    "@shen_vickie"
   ],
   "baseBranches": [
     "development"
@@ -8,7 +8,7 @@
   "packageRules": [
     {
       "datasources": [
-        "github-releases"
+        "github-tags"
       ],
       "packageNames": [
         "python/cpython"
@@ -18,5 +18,27 @@
         "enabled": false
       }
     }
+  ],
+  "regexManagers": [
+    {
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
+      "matchStrings": [
+        "org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\""
+      ],
+      "depNameTemplate": "python/cpython",
+      "datasourceTemplate": "github-tags"
+    },
+    {
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
+      "matchStrings": [
+        "tags:\\s+-\\s+\"(?<currentValue>.+?)\""
+      ],
+      "depNameTemplate": "python/cpython",
+      "datasourceTemplate": "github-tags"
+    }
   ]
 }