Skip to content

Commit

Permalink
fix other stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
pvizeli authored Sep 23, 2023
1 parent fe67bff commit fa72697
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
15 changes: 1 addition & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ FROM $BUILD_FROM

ARG \
BUILD_ARCH \
CAS_VERSION \
YQ_VERSION \
COSIGN_VERSION

Expand All @@ -14,15 +13,7 @@ RUN \
docker \
docker-cli-buildx \
coreutils \
&& apk add --no-cache --virtual .build-dependencies \
build-base \
go \
\
&& git clone -b v${CAS_VERSION} --depth 1 \
https://github.com/codenotary/cas \
&& cd cas \
&& make cas \
&& mv cas /usr/bin/cas \
&& if [ "${BUILD_ARCH}" = "armhf" ] || [ "${BUILD_ARCH}" = "armv7" ]; then \
wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_arm"; \
wget -q -O /usr/bin/cosign "https://github.com/home-assistant/cosign/releases/download/${COSIGN_VERSION}/cosign_armhf"; \
Expand All @@ -39,11 +30,7 @@ RUN \
exit 1; \
fi \
&& chmod +x /usr/bin/yq \
&& chmod +x /usr/bin/cosign \
\
&& apk del .build-dependencies \
&& rm -rf /root/go /root/.cache \
&& rm -rf /usr/src/cas
&& chmod +x /usr/bin/cosign

COPY builder.sh /usr/bin/

Expand Down
4 changes: 0 additions & 4 deletions build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,10 @@ build_from:
armhf: "ghcr.io/home-assistant/armhf-base:3.18"
amd64: "ghcr.io/home-assistant/amd64-base:3.18"
i386: "ghcr.io/home-assistant/i386-base:3.18"
codenotary:
signer: [email protected]
base_image: [email protected]
cosign:
base_identity: https://github.com/home-assistant/docker-base/.*
identity: https://github.com/home-assistant/builder/.*
args:
CAS_VERSION: "1.0.1"
YQ_VERSION: "v4.13.2"
COSIGN_VERSION: "2.0.2"
labels:
Expand Down

0 comments on commit fa72697

Please sign in to comment.