Merge pull request #34 from legendu-net/dev

dclong · web-flow · commit 079eeb6da69f · 2024-08-25T13:29:21.000-07:00
Merge dev into main
diff --git a/Dockerfile b/Dockerfile
@@ -6,8 +6,8 @@ RUN apt-get update -y \
     && apt-get install -y --no-install-recommends \
         python3 python3-pip python3-venv \
         python3-all-dev python3-setuptools build-essential python3-wheel python3-apt \
-    && pip3 install -U pip \
-    && pip3 install \
+    #&& pip3 install -U --break-system-packages pip \
+    && pip3 install --break-system-packages \
         pytype pylint black[jupyter] isort pytest ipython \
         wajig \
     && ln -svf /usr/bin/python3 /usr/bin/python \
diff --git a/build.sh b/build.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
+docker pull dclong/base:next
 docker build -t dclong/python:next .

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`
	`3`	`+docker pull dclong/base:next`
`3`	`4`	`docker build -t dclong/python:next .`