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

# Conflicts: # Dockerfile
cisagov · Jul 14, 2023 · 2a28267 · 2a28267
2 parents 5d38ef2 + 8c26a61
commit 2a28267
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -115,7 +115,7 @@ repos:
           - --config=.bandit.yml
   # Run bandit on everything except the "tests" tree
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.4
+    rev: 1.7.5
     hooks:
       - id: bandit
         name: bandit (everything else)

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,11 @@
 ARG VERSION=unspecified
 
+<<<<<<< HEAD
 # Stage 1 - Build
 FROM node:18-alpine as node
+=======
+FROM python:3.11.4-alpine
+>>>>>>> 8c26a61517f4254b82bb73a78544145c62828a89
 
 # Set working directory
 WORKDIR /app