Skip to content

Commit

Permalink
chore: git worflows improvements
Browse files Browse the repository at this point in the history
Merge main into branch
  • Loading branch information
SebastianScheidegger committed Jan 16, 2025
2 parents 8517ac5 + aaf1ca9 commit 3f5eeb1
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
- name: Build and push
uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
with:
context: .
provenance: false
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ repos:
- id: poetry-lock
- id: poetry-check
- repo: https://github.com/zricethezav/gitleaks
rev: v8.23.0
rev: v8.23.1
hooks:
- id: gitleaks
- repo: https://github.com/grigoriev/pre-commit-check-git-user
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.13.1-slim@sha256:1127090f9fff0b8e7c3a1367855ef8a3299472d2c9ed122948a576c39addeaf1
FROM python:3.13.1-slim@sha256:23a81be7b258c8f516f7a60e80943cace4350deb8204cf107c7993e343610d47
LABEL maintainer="SBB Polarion Team <[email protected]>"

ARG APP_IMAGE_VERSION=0.0.0-dev
Expand All @@ -9,6 +9,6 @@ COPY ./app/ ${WORKING_DIR}/app/
COPY ./poetry.lock ${WORKING_DIR}

Check warning on line 9 in Dockerfile

View workflow job for this annotation

GitHub Actions / release-please

Variables should be defined before their use

UndefinedVar: Usage of undefined variable '$WORKING_DIR' More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

Check warning on line 9 in Dockerfile

View workflow job for this annotation

GitHub Actions / release-please

Variables should be defined before their use

UndefinedVar: Usage of undefined variable '$WORKING_DIR' More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/
COPY ./pyproject.toml ${WORKING_DIR}

Check warning on line 10 in Dockerfile

View workflow job for this annotation

GitHub Actions / release-please

Variables should be defined before their use

UndefinedVar: Usage of undefined variable '$WORKING_DIR' More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

Check warning on line 10 in Dockerfile

View workflow job for this annotation

GitHub Actions / release-please

Variables should be defined before their use

UndefinedVar: Usage of undefined variable '$WORKING_DIR' More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

RUN pip install --no-cache-dir -r "${WORKING_DIR}"/requirements.txt && poetry install
RUN pip install --no-cache-dir -r "${WORKING_DIR}"/requirements.txt && poetry install --no-root

ENTRYPOINT [ "poetry", "run", "python", "-m", "app.requirements_inspector_service" ]
2 changes: 1 addition & 1 deletion poetry.lock

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

9 changes: 7 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
[tool.poetry]
[project]
name = "open-source-polarion-docker-repo-template"
version = "0.1.0"
description = ""
authors = [
"SBB Polarion Team <[email protected]>",
{name="SBB Polarion Team", email="[email protected]"}
]
license = "Apache License 2.0"
readme = "README.md"
requires-python=">=3.13"
dependencies = []

[tool.poetry]
packages = [{include = "app"}]
requires-poetry = ">=2.0"

[tool.poetry.dependencies]
python = "^3.13"
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
poetry==1.8.5
poetry==2.0.1

0 comments on commit 3f5eeb1

Please sign in to comment.