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

Adjustments for new base images #303

Merged
merged 6 commits into from
Oct 18, 2023
Merged

Adjustments for new base images #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
060cbc3
Pre-configure pip & s6 in base image
frenck Oct 16, 2023
16a890a
Fix missing slash
frenck Oct 16, 2023
9b0a84b
Use pip conf, to avoid issues with passing along env vars
frenck Oct 17, 2023
3d64f33
Adjust handolint
frenck Oct 17, 2023
ba93887
Styling
frenck Oct 17, 2023
7345a2f
Adjust based on upstream base images changes
frenck Oct 18, 2023
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
3 changes: 1 addition & 2 deletions .hadolint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
ignored:
- DL3003
- DL3006
- DL3013
- DL3018
- DL3042
- SC2155
- SC2046
6 changes: 2 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ ARG \
PICOTTS_HASH \
TELLDUS_COMMIT

# Add Home Assistant wheels repository
ENV WHEELS_LINKS=https://wheels.home-assistant.io/musllinux/

##
# Install component packages
RUN \
Expand Down Expand Up @@ -42,7 +39,7 @@ RUN \
## Install pip module for component/homeassistant
COPY requirements.txt /usr/src/
RUN \
pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
pip3 install --only-binary=:all: \
-r /usr/src/requirements.txt \
&& rm -f /usr/src/requirements.txt

Expand Down Expand Up @@ -144,6 +141,7 @@ RUN \
/usr/src/telldus \
/usr/src/telldus-fix-gcc-11-issues.patch \
/usr/src/telldus-fix-alpine-3-17-issues.patch

###
# Base S6-Overlay
COPY rootfs /
Loading