Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mirrored_repos
HomeAssistant
Core
Commits
13fe2a99
Unverified
Commit
13fe2a99
authored
1 month ago
by
Robert Resch
Committed by
GitHub
1 month ago
Browse files
Options
Downloads
Patches
Plain Diff
Reorder Dockerfile to improve caching (#138789)
parent
df508638
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+18
-18
18 additions, 18 deletions
Dockerfile
script/hassfest/docker.py
+18
-18
18 additions, 18 deletions
script/hassfest/docker.py
with
36 additions
and
36 deletions
Dockerfile
+
18
−
18
View file @
13fe2a99
...
...
@@ -12,6 +12,24 @@ ENV \
ARG
QEMU_CPU
# Home Assistant S6-Overlay
COPY
rootfs /
# Needs to be redefined inside the FROM statement to be set for RUN commands
ARG
BUILD_ARCH
# Get go2rtc binary
RUN
\
case
"
${
BUILD_ARCH
}
"
in
\
"aarch64"
)
go2rtc_suffix
=
'arm64'
;;
\
"armhf"
)
go2rtc_suffix
=
'armv6'
;;
\
"armv7"
)
go2rtc_suffix
=
'arm'
;;
\
*
)
go2rtc_suffix
=
${
BUILD_ARCH
}
;;
\
esac
\
&&
curl
-L
https://github.com/AlexxIT/go2rtc/releases/download/v1.9.8/go2rtc_linux_
${
go2rtc_suffix
}
--output
/bin/go2rtc
\
&&
chmod
+x /bin/go2rtc
\
# Verify go2rtc can be executed
&& go2rtc --version
# Install uv
RUN
pip3
install
uv
==
0.6.1
...
...
@@ -42,22 +60,4 @@ RUN \
&&
python3
-m
compileall
\
homeassistant/homeassistant
# Home Assistant S6-Overlay
COPY
rootfs /
# Needs to be redefined inside the FROM statement to be set for RUN commands
ARG
BUILD_ARCH
# Get go2rtc binary
RUN
\
case
"
${
BUILD_ARCH
}
"
in
\
"aarch64"
)
go2rtc_suffix
=
'arm64'
;;
\
"armhf"
)
go2rtc_suffix
=
'armv6'
;;
\
"armv7"
)
go2rtc_suffix
=
'arm'
;;
\
*
)
go2rtc_suffix
=
${
BUILD_ARCH
}
;;
\
esac
\
&&
curl
-L
https://github.com/AlexxIT/go2rtc/releases/download/v1.9.8/go2rtc_linux_
${
go2rtc_suffix
}
--output
/bin/go2rtc
\
&&
chmod
+x /bin/go2rtc
\
# Verify go2rtc can be executed
&& go2rtc --version
WORKDIR
/config
This diff is collapsed.
Click to expand it.
script/hassfest/docker.py
+
18
−
18
View file @
13fe2a99
...
...
@@ -26,6 +26,24 @@ ENV \
ARG QEMU_CPU
# Home Assistant S6-Overlay
COPY rootfs /
# Needs to be redefined inside the FROM statement to be set for RUN commands
ARG BUILD_ARCH
# Get go2rtc binary
RUN \
case
"
${{BUILD_ARCH}}
"
in \
"
aarch64
"
) go2rtc_suffix=
'
arm64
'
;; \
"
armhf
"
) go2rtc_suffix=
'
armv6
'
;; \
"
armv7
"
) go2rtc_suffix=
'
arm
'
;; \
*) go2rtc_suffix=${{BUILD_ARCH}} ;; \
esac \
&& curl -L https://github.com/AlexxIT/go2rtc/releases/download/v{go2rtc}/go2rtc_linux_${{go2rtc_suffix}} --output /bin/go2rtc \
&& chmod +x /bin/go2rtc \
# Verify go2rtc can be executed
&& go2rtc --version
# Install uv
RUN pip3 install uv=={uv}
...
...
@@ -56,24 +74,6 @@ RUN \
&& python3 -m compileall \
homeassistant/homeassistant
# Home Assistant S6-Overlay
COPY rootfs /
# Needs to be redefined inside the FROM statement to be set for RUN commands
ARG BUILD_ARCH
# Get go2rtc binary
RUN \
case
"
${{BUILD_ARCH}}
"
in \
"
aarch64
"
) go2rtc_suffix=
'
arm64
'
;; \
"
armhf
"
) go2rtc_suffix=
'
armv6
'
;; \
"
armv7
"
) go2rtc_suffix=
'
arm
'
;; \
*) go2rtc_suffix=${{BUILD_ARCH}} ;; \
esac \
&& curl -L https://github.com/AlexxIT/go2rtc/releases/download/v{go2rtc}/go2rtc_linux_${{go2rtc_suffix}} --output /bin/go2rtc \
&& chmod +x /bin/go2rtc \
# Verify go2rtc can be executed
&& go2rtc --version
WORKDIR /config
"""
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment