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

Update all minor versions (minor) #454

Merged
merged 3 commits into from
Aug 12, 2024
Merged

Update all minor versions (minor) #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7dc12dd
Update all minor versions
renovate[bot] Aug 12, 2024
0043672
Fix pip update
sbrunner Aug 12, 2024
76b89a5
Update dpkg versions list
geo-ghci-int[bot] Aug 12, 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
17 changes: 9 additions & 8 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Base of all section, install the apt packages
FROM ubuntu:24.04 as base-all
FROM ubuntu:24.04 AS base-all
LABEL maintainer Camptocamp "[email protected]"

# Fail on error on pipe, see: https://github.com/hadolint/hadolint/wiki/DL4006.
Expand All @@ -11,13 +11,14 @@ RUN --mount=type=cache,target=/var/lib/apt/lists \
--mount=type=cache,target=/var/cache,sharing=locked \
apt-get update \
&& apt-get upgrade --assume-yes \
&& apt-get install --assume-yes --no-install-recommends python3-pip postgresql-client docker.io libmagic1 git curl gnupg zlib1g libpq5
&& apt-get install --assume-yes --no-install-recommends python3-pip python3-venv postgresql-client docker.io libmagic1 git curl gnupg zlib1g libpq5 \
&& python3 -m venv /venv

RUN rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
ENV PATH=/venv/bin:$PATH

# Used to convert the locked packages by poetry to pip requirements format
# We don't directly use `poetry install` because it force to use a virtual environment.
FROM base-all as poetry
FROM base-all AS poetry

# Fail on error on pipe, see: https://github.com/hadolint/hadolint/wiki/DL4006.
# Treat unset variables as an error when substituting.
Expand All @@ -37,7 +38,7 @@ RUN poetry export --output=requirements.txt \
&& poetry export --with=dev --output=requirements-dev.txt

# Base, the biggest thing is to install the Python packages
FROM base-all as base
FROM base-all AS base

# Fail on error on pipe, see: https://github.com/hadolint/hadolint/wiki/DL4006.
# Treat unset variables as an error when substituting.
Expand Down Expand Up @@ -102,7 +103,7 @@ EXPOSE 8080
WORKDIR /app/

# The final part
FROM base as runner
FROM base AS runner

ENV PATH=/pyenv/shims:/pyenv/bin:/var/www/.local/bin/:${PATH} \
PYENV_ROOT=/pyenv
Expand Down Expand Up @@ -154,7 +155,7 @@ RUN mkdir -p /prometheus-metrics \
ENV PROMETHEUS_MULTIPROC_DIR=/prometheus-metrics

# Do the lint, used by the tests
FROM base as tests
FROM base AS tests

# Fail on error on pipe, see: https://github.com/hadolint/hadolint/wiki/DL4006.
# Treat unset variables as an error when substituting.
Expand All @@ -172,7 +173,7 @@ RUN --mount=type=cache,target=/root/.cache \
python3 -m pip install --disable-pip-version-check --no-deps --requirement=/poetry/requirements-dev.txt

# hadolint ignore=DL3003
RUN cd /usr/local/lib/python3.12/dist-packages/c2cwsgiutils/acceptance/ && npm install
RUN cd /venv/lib/python3.12/site-packages/c2cwsgiutils/acceptance/ && npm install

COPY . ./
RUN --mount=type=cache,target=/root/.cache \
Expand Down
6 changes: 5 additions & 1 deletion ci/dpkg-versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ camptocamp/github-app-geo-project:latest:
ubuntu_24_04/ncurses-base: 6.4+20240113-1ubuntu2
ubuntu_24_04/ncurses-bin: 6.4+20240113-1ubuntu2
ubuntu_24_04/netbase: '6.4'
ubuntu_24_04/nodejs: 18.20.4-1nodesource1
ubuntu_24_04/nodejs: 20.16.0-1nodesource1
ubuntu_24_04/openjdk-21-jre: 21.0.4+7-1ubuntu2~24.04
ubuntu_24_04/openjdk-21-jre-headless: 21.0.4+7-1ubuntu2~24.04
ubuntu_24_04/openssl: 3.0.13-0ubuntu3.2
Expand All @@ -417,12 +417,16 @@ camptocamp/github-app-geo-project:latest:
ubuntu_24_04/python3-minimal: 3.12.3-0ubuntu1
ubuntu_24_04/python3-packaging: 24.0-1
ubuntu_24_04/python3-pip: 24.0+dfsg-1ubuntu1
ubuntu_24_04/python3-pip-whl: 24.0+dfsg-1ubuntu1
ubuntu_24_04/python3-pkg-resources: 68.1.2-2ubuntu1
ubuntu_24_04/python3-setuptools: 68.1.2-2ubuntu1
ubuntu_24_04/python3-setuptools-whl: 68.1.2-2ubuntu1
ubuntu_24_04/python3-venv: 3.12.3-0ubuntu1
ubuntu_24_04/python3-wheel: 0.42.0-2
ubuntu_24_04/python3.12: 3.12.3-1ubuntu0.1
ubuntu_24_04/python3.12-dev: 3.12.3-1ubuntu0.1
ubuntu_24_04/python3.12-minimal: 3.12.3-1ubuntu0.1
ubuntu_24_04/python3.12-venv: 3.12.3-1ubuntu0.1
ubuntu_24_04/readline-common: 8.2-4build1
ubuntu_24_04/rpcsvc-proto: 1.4.2-0ubuntu7
ubuntu_24_04/runc: 1.1.12-0ubuntu3
Expand Down
24 changes: 12 additions & 12 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"description": "",
"author": "",
"dependencies": {
"@jamietanna/renovate-graph": "0.19.0",
"@snyk/fix": "1.1291.1",
"snyk": "1.1291.1",
"@jamietanna/renovate-graph": "0.20.1",
"@snyk/fix": "1.1292.2",
"snyk": "1.1292.2",
"snyk-python-plugin": "2.2.1"
}
}
Loading
Loading