Skip to content

Commit

Permalink
Merge pull request #77 from cisagov/dependabot/docker/alpine-3.18
Browse files Browse the repository at this point in the history
Bump alpine from 3.17 to 3.18
  • Loading branch information
jsf9k authored Oct 26, 2023
2 parents 01368c8 + 7fc3e8e commit 1179c03
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,29 @@
# in the Python Docker image we use for the build-stage. The tag of the Python
# Docker image matches the version of the python3 package available on Alpine
# for consistency.
FROM alpine:3.17 AS compile-stage
FROM alpine:3.18 AS compile-stage

# Unprivileged user information necessary for the Python virtual environment
ARG CISA_USER="cisa"
ENV CISA_HOME="/home/${CISA_USER}"
ENV VIRTUAL_ENV="${CISA_HOME}/.venv"

# Versions of the Python packages installed directly
ENV PYTHON_PIP_VERSION=23.0.1
ENV PYTHON_PIPENV_VERSION=2023.3.20
ENV PYTHON_SETUPTOOLS_VERSION=67.6.1
ENV PYTHON_PIP_VERSION=23.1.2
ENV PYTHON_PIPENV_VERSION=2023.10.20
ENV PYTHON_SETUPTOOLS_VERSION=67.7.2
ENV PYTHON_WHEEL_VERSION=0.40.0

RUN apk --no-cache add \
gcc=12.2.1_git20220924-r4 \
libc-dev=0.7.2-r3 \
libxml2-dev=2.10.4-r0 \
libxslt-dev=1.1.37-r1 \
py3-pip=22.3.1-r1 \
py3-setuptools=65.6.0-r0 \
py3-wheel=0.38.4-r0 \
python3-dev=3.10.13-r0 \
python3=3.10.13-r0
gcc=12.2.1_git20220924-r10 \
libc-dev=0.7.2-r5 \
libxml2-dev=2.11.4-r0 \
libxslt-dev=1.1.38-r0 \
py3-pip=23.1.2-r0 \
py3-setuptools=67.7.2-r0 \
py3-wheel=0.40.0-r1 \
python3-dev=3.11.6-r0 \
python3=3.11.6-r0

# Install pipenv to manage installing the Python dependencies into a created
# Python virtual environment. This is done separately from the virtual
Expand All @@ -52,7 +52,7 @@ RUN pipenv sync --clear --verbose

# The version of Python used here should match the version of the Alpine
# python3 package installed in the compile-stage.
FROM python:3.10.12-alpine3.17 AS build-stage
FROM python:3.11.6-alpine3.18 AS build-stage

###
# For a list of pre-defined annotation keys and value types see:
Expand All @@ -73,9 +73,9 @@ ENV VIRTUAL_ENV="${CISA_HOME}/.venv"

RUN apk --no-cache add \
ca-certificates=20230506-r0 \
chromium=112.0.5615.165-r0 \
libxml2=2.10.4-r0 \
libxslt=1.1.37-r1
chromium=117.0.5938.62-r0 \
libxml2=2.11.4-r0 \
libxslt=1.1.38-r0

# Create unprivileged user
RUN addgroup --system --gid ${CISA_GID} ${CISA_GROUP} \
Expand Down

0 comments on commit 1179c03

Please sign in to comment.