opendev/system-config
Code Issues Proposed changes

Fix python-builder container image system updates

Browse Source 
There was a small issue in the recent change to perform system updates
when building the python-builder and python-base images. I didn't
realize that python-builder is a two stage build and we need to do the
update in both stages.

Ultimately this has minimal impact on the final images we produce as
those are all build on python-base not python-builder. But to ensure
some difference during python wheel build time on builder doesn't affect
the install location on the base image we should keep these in sync.

Change-Id: I16159fbb490b0ec2e179381a50b9570c9aacd18f
This commit is contained in:
Clark Boylan 2023-10-04 08:32:34 -07:00
parent e81e37ad43
commit dd48296edd
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/python-base/Dockerfile
View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Comment to force rebuilds Tue Oct 3 04:19:33 PM PDT 2023 # Comment to force rebuilds Wed Oct 4 03:32:07 PM UTC 2023
ARG PYTHON_VERSION=3.11 ARG PYTHON_VERSION=3.11
ARG DEBIAN_VERSION=bullseye ARG DEBIAN_VERSION=bullseye

6
docker/python-builder/Dockerfile
View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Comment to force rebuilds Tue Oct 3 04:19:33 PM PDT 2023 # Comment to force rebuilds Wed Oct 4 03:32:07 PM UTC 2023
ARG PYTHON_VERSION=3.11 ARG PYTHON_VERSION=3.11
ARG DEBIAN_VERSION=bullseye ARG DEBIAN_VERSION=bullseye
@ -38,7 +38,9 @@ COPY --from=fake-python /tmp/python3-dev_4.0.0_all.deb /tmp/python3-dev_4.0.0_al
COPY scripts/assemble /usr/local/bin/assemble COPY scripts/assemble /usr/local/bin/assemble
COPY scripts/get-extras-packages /usr/local/bin/get-extras-packages COPY scripts/get-extras-packages /usr/local/bin/get-extras-packages
COPY scripts/install-from-bindep /output/install-from-bindep COPY scripts/install-from-bindep /output/install-from-bindep
RUN dpkg -i /tmp/python3-dev_4.0.0_all.deb \ RUN apt-get update \
&& apt-get dist-upgrade -y \
&& dpkg -i /tmp/python3-dev_4.0.0_all.deb \
&& rm /tmp/python3-dev_4.0.0_all.deb \ && rm /tmp/python3-dev_4.0.0_all.deb \
&& pip install --no-cache-dir bindep \ && pip install --no-cache-dir bindep \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \