Skip to content

Commit

Permalink
Merge pull request #242 from Cray-HPE/relaese/2.13.0
Browse files Browse the repository at this point in the history
Release 2.13.0
  • Loading branch information
jsollom-hpe authored Jan 11, 2024
2 parents c29c1b9 + 614ddc0 commit f2123f3
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
## [2.13.0] - 2024-01-10
### Fixed
- Fix a broken build caused by PEP-668. Pin Alpine version to 3. This is less restrictive.

## [2.12.0] - 2024-01-02
### Changed
Expand Down
13 changes: 9 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

# Upstream Build Args
ARG OPENAPI_IMAGE=artifactory.algol60.net/csm-docker/stable/docker.io/openapitools/openapi-generator-cli:v6.6.0
ARG ALPINE_BASE_IMAGE=artifactory.algol60.net/csm-docker/stable/docker.io/library/alpine:3.18
ARG ALPINE_BASE_IMAGE=artifactory.algol60.net/csm-docker/stable/docker.io/library/alpine:3

# Generate Code
FROM $OPENAPI_IMAGE as codegen
Expand Down Expand Up @@ -56,8 +56,13 @@ COPY constraints.txt requirements.txt /app/
RUN apk add --upgrade --no-cache apk-tools busybox && \
apk update && \
apk add --no-cache gcc g++ python3-dev py3-pip musl-dev libffi-dev openssl-dev && \
apk -U upgrade --no-cache && \
pip3 install --no-cache-dir -U pip
apk -U upgrade --no-cache
# Create a virtual environment in which we can install Python packages. This
# isolates our installation from the system installation.
ENV VIRTUAL_ENV=/app/venv
RUN python3 -m venv $VIRTUAL_ENV
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
RUN pip3 install --no-cache-dir -U pip
RUN --mount=type=secret,id=netrc,target=/root/.netrc pip3 install --no-cache-dir -r requirements.txt
RUN cd lib && pip3 install --no-cache-dir .

Expand Down Expand Up @@ -87,7 +92,7 @@ CMD [ "./docker_api_test_entry.sh" ]
FROM base as intermediate
WORKDIR /app
EXPOSE 9000
RUN apk add --no-cache uwsgi-python3
RUN pip3 install --no-cache-dir uWSGI
COPY config/uwsgi.ini ./
ENTRYPOINT ["uwsgi", "--ini", "/app/uwsgi.ini"]

Expand Down

0 comments on commit f2123f3

Please sign in to comment.