Skip to content

Commit

Permalink
Merge pull request #175 from fhem/renovate/pin-dependencies
Browse files Browse the repository at this point in the history
chore(deps): pin dependencies
  • Loading branch information
sidey79 committed Apr 27, 2024
2 parents eabadca + 0d7c098 commit 4d697a2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/docker-matrix-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Get Python version from Dockerfile
id: cache-key
run: |
image_version=$(grep -m 1 '^FROM' Dockerfile | cut -d ' ' -f2 | cut -d ':' -f2)
image_version=$(grep -m 1 '^FROM' Dockerfile | cut -d ' ' -f2 | cut -d ':' -f2 | cut -d '@' -f1)
echo "IMAGE_VERSION_SHORT=${image_version%.*}" >> $GITHUB_ENV
echo "IMAGE_VERSION=${image_version}" >> $GITHUB_ENV
Expand Down Expand Up @@ -252,7 +252,7 @@ jobs:
- name: Get Python version from Dockerfile
id: cache-key
run: |
image_version=$(grep -m 1 '^FROM' Dockerfile | cut -d ' ' -f2 | cut -d ':' -f2)
image_version=$(grep -m 1 '^FROM' Dockerfile | cut -d ' ' -f2 | cut -d ':' -f2 | cut -d '@' -f1)
echo "IMAGE_VERSION_SHORT=${image_version%.*}" >> $GITHUB_ENV
echo "IMAGE_VERSION=${image_version}" >> $GITHUB_ENV
Expand Down Expand Up @@ -461,7 +461,7 @@ jobs:
id: extract_image
run: |
echo "image_name=$(grep -m 1 '^FROM' Dockerfile | cut -d ' ' -f2 | cut -d ':' -f1)" >> $GITHUB_OUTPUT
echo "image_version=$(grep -m 1 '^FROM' Dockerfile | cut -d ' ' -f2 | cut -d ':' -f2)" >> $GITHUB_OUTPUT
echo "image_version=$(grep -m 1 '^FROM' Dockerfile | cut -d ' ' -f2 | cut -d ':' -f2 | cut -d '@' -f1)" >> $GITHUB_OUTPUT
- name: Update docs (readme.md)
run: |
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# syntax=docker.io/docker/dockerfile:1.6.0
# syntax=docker.io/docker/dockerfile:1.6.0@sha256:ac85f380a63b13dfcefa89046420e1781752bab202122f8f50032edf31be0021


# Building wheels for later useage
FROM python:3.12.3 as builder-base
FROM python:3.12.3@sha256:f78ea8a345769eb3aa1c86cf147dfd68f1a4508ed56f9d7574e4687b02f44dd1 as builder-base

#RUN curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | sh -s -- -y

Expand Down Expand Up @@ -45,7 +45,7 @@ COPY --from=w-builder /wheels ./wheels


# base fhempy will be installed
FROM python:3.12.3 as base
FROM python:3.12.3@sha256:f78ea8a345769eb3aa1c86cf147dfd68f1a4508ed56f9d7574e4687b02f44dd1 as base

RUN apt update && \
apt install dbus python-dbus-dev curl -y --no-install-recommends \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.wheels
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1
# syntax=docker/dockerfile:1@sha256:a57df69d0ea827fb7266491f2813635de6f17269be881f696fbfdf2d83dda33e

# base
FROM python:3.12.3 as base
FROM python:3.12.3@sha256:f78ea8a345769eb3aa1c86cf147dfd68f1a4508ed56f9d7574e4687b02f44dd1 as base
RUN apt update && \
apt install dbus python-dbus-dev build-essential libssl-dev libffi-dev python3-dev -y --no-install-recommends \
&& rm -rf /var/lib/apt/lists/*
Expand Down

0 comments on commit 4d697a2

Please sign in to comment.