Merge https://github.com/cisagov/skeleton-docker into lineage/skeleton

# Conflicts: # Dockerfile
cisagov · Feb 11, 2023 · 1e84595 · 1e84595
2 parents 228cc91 + 1f63a52
commit 1e84595
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -42,12 +42,16 @@ RUN apk --no-cache --quiet add ${DEPS}
 # slightly longer install times.
 ###
 <<<<<<< HEAD
+<<<<<<< HEAD
 RUN pip3 install --no-cache-dir --upgrade \
     pip==21.3.1 \
     setuptools==60.5.0 \
     wheel==0.37.1
 =======
 RUN pip install --no-cache-dir --upgrade \
+=======
+RUN pip3 install --no-cache-dir --upgrade \
+>>>>>>> 1f63a5218995bb146a2ff786b96f219b7e16f20a
     pip \
     setuptools \
     wheel