Merge branch 'master' into parcel-babel-jest

sillsdev · Dec 13, 2024 · 7bb15ae · 7bb15ae
2 parents 286c727 + 5251099
commit 7bb15ae
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/combine_deploy_image.yml b/.github/workflows/combine_deploy_image.yml
@@ -22,10 +22,10 @@ jobs:
           egress-policy: block
           allowed-endpoints: >
             api.ecr-public.us-east-1.amazonaws.com:443
-            api.github.com:443
             archive.ubuntu.com:80
             auth.docker.io:443
             cdn.dl.k8s.io:443
+            deb.debian.org:80
             dl.k8s.io:443
             files.pythonhosted.org:443
             get.helm.sh:443
@@ -54,7 +54,7 @@ jobs:
           username: ${{ secrets.AWS_ACCESS_KEY_ID }}
           password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       - name: Build combine_deploy
-        uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
+        uses: docker/build-push-action@v6.10.0
         with:
           context: "{{defaultContext}}:deploy"
           push: true

diff --git a/Dockerfile b/Dockerfile
@@ -7,7 +7,7 @@
 ############################################################
 
 # User guide build environment
-FROM python:3.12.7-slim-bookworm AS user_guide_builder
+FROM python:3.12.8-slim-bookworm AS user_guide_builder
 
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1

diff --git a/deploy/Dockerfile b/deploy/Dockerfile
@@ -5,12 +5,12 @@
 #   - Intel/AMD 64-bit
 ############################################################
 
-FROM ubuntu:22.04
+FROM python:3.12.8-slim-bookworm
 
 USER root
 
 RUN apt-get update && \
-  apt-get install -y python3 python3-pip nano curl openssh-client iputils-ping && \
+  apt-get install -y python3-pip nano curl openssh-client iputils-ping && \
   apt-get autoremove && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/*