Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2.13.0 #242

Merged
merged 7 commits into from
Jan 11, 2024
Merged

Release 2.13.0 #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c99ae33
CASMCMS-8879: Fix build issue caused by PEP-668
jsollom-hpe Dec 12, 2023
4eecbcb
Merge pull request #240 from Cray-HPE/mergeback-master-develop-170421…
mharding-hpe Jan 2, 2024
ad7896c
Merge branch 'develop' into CASMCMS-8879
jsollom-hpe Jan 5, 2024
168d4a4
Merge pull request #235 from Cray-HPE/CASMCMS-8879
jsollom-hpe Jan 5, 2024
d723d6b
CASMCMS-8879: Unpin the Alpine version from 3.18 back to 3
jsollom-hpe Jan 10, 2024
dfa1adc
Merge pull request #241 from Cray-HPE/CASMCMS-8879
jsollom-hpe Jan 10, 2024
614ddc0
Release BOS version 2.13.0
jsollom-hpe Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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
Loading