From 978aff29e57f96367214477d7c4a28d4cb878515 Mon Sep 17 00:00:00 2001
From: Reid Hewitt <92057378+rshewitt@users.noreply.github.com>
Date: Tue, 3 Dec 2024 08:55:34 -0700
Subject: [PATCH] update snyk expirations; update base image

---
 .snyk      | 18 +++++++++---------
 Dockerfile | 13 ++++++++-----
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.snyk b/.snyk
index 83ee84f0..217c6483 100644
--- a/.snyk
+++ b/.snyk
@@ -7,60 +7,60 @@ ignore:
         reason: >-
           Upgrade path is complex, Issue tracked in github:
           https://github.com/GSA/data.gov/issues/4217
-        expires: 2024-11-30T13:35:17.967Z
+        expires: 2025-02-28T19:29:54.032Z
         created: 2023-11-01T13:35:17.972Z
   SNYK-PYTHON-BEAKER-575115:
     - '*':
         reason: >-
           No remediation available yet; Not affecting us since the storage is
           not accessible to any other client
-        expires: 2024-11-30T16:20:58.017Z
+        expires: 2025-02-28T19:29:54.032Z
         created: 2022-12-08T16:20:58.023Z
   SNYK-PYTHON-WERKZEUG-3319936:
     - '*':
         reason: >-
           Upgrade path is complex, Issue tracked in github:
           https://github.com/GSA/data.gov/issues/4217
-        expires: 2024-11-30T16:20:58.017Z
+        expires: 2025-02-28T19:29:54.032Z
         created: 2023-02-15T16:20:58.023Z
   SNYK-PYTHON-WERKZEUG-3319935:
     - '*':
         reason: >-
           Upgrade path is complex, Issue tracked in github:
           https://github.com/GSA/data.gov/issues/4217
-        expires: 2024-11-30T16:20:58.017Z
+        expires: 2025-02-28T16:20:58.017Z
         created: 2023-02-15T16:20:58.023Z
   SNYK-PYTHON-FLASK-5490129:
     - '*':
         reason: >-
           Upgrade path is complex, Issue tracked in github:
           https://github.com/GSA/data.gov/issues/4303
-        expires: 2024-11-30T16:20:58.017Z
+        expires: 2025-02-28T19:29:54.032Z
         created: 2023-05-08T16:20:58.023Z
   SNYK-PYTHON-PYOPENSSL-6149520:
     - '*':
         reason: >-
           No remediation available yet; Issue tracked in github:
           https://github.com/GSA/data.gov/issues/4532
-        expires: 2024-11-30T19:29:54.032Z
+        expires: 2025-02-28T19:29:54.032Z
         created: 2024-01-11T19:29:54.039Z
   SNYK-PYTHON-PYOPENSSL-6157250:
     - '*':
         reason: >-
           No remediation available yet; Issue tracked in github:
           https://github.com/GSA/data.gov/issues/4591
-        expires: 2024-11-30T19:29:54.032Z
+        expires: 2025-02-28T19:29:54.032Z
   SNYK-PYTHON-PYOPENSSL-6592766:
     - '*':
         reason: >-
           No remediation available yet; Low severity.
-        expires: 2024-11-30T17:24:47.251Z
+        expires: 2025-02-28T17:24:47.251Z
         created: 2024-04-24T17:24:47.257Z
   SNYK-PYTHON-WERKZEUG-6808933:
     - '*':
         reason: >-
            Not affecting us since no debugger is enabled in cloud.gov apps
-        expires: 2024-11-30T16:20:58.017Z
+        expires: 2025-02-28T19:29:54.032Z
   SNYK-PYTHON-WERKZEUG-8309091:
     - '*':
         reason: >-
diff --git a/Dockerfile b/Dockerfile
index 9d0b4743..f5fd42db 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,12 @@
-FROM ckan/ckan-dev:2.10.5
+FROM ckan/ckan-dev:2.10.5-py3.10
 # Inherit from here: https://github.com/okfn/docker-ckan/blob/master/ckan-dev/2.10/Dockerfile
 # And then from here: https://github.com/okfn/docker-ckan/blob/master/ckan-base/2.10/Dockerfile
 
-ENV CKAN_HOME /srv/app
-ENV CKAN_CONFIG /app/config
-ENV APP_DIR /app
+USER root
+
+ENV CKAN_HOME=/srv/app
+ENV CKAN_CONFIG=/app/config
+ENV APP_DIR=/app
 # ENV CKAN_ENV docker
 
 # TODO: Figure out if these things are necessary?
@@ -12,7 +14,8 @@ ENV APP_DIR /app
 # RUN apk add libressl-dev musl-dev libffi-dev xmlsec vim xmlsec-dev
 
 # Install vim and zip
-RUN apk add vim zip xmlsec
+RUN apt-get update -y && \ 
+  apt-get install -y vim zip xmlsec1 ncat
 
 COPY requirements.txt requirements-dev.txt ${APP_DIR}/
 ADD setup.py README.md ${APP_DIR}/