Skip to content

Commit c494838

Browse files
Rakshitha-Kamathandrewschoen
authored andcommitted
Add alloy license to the container image
Signed-off-by: Rakshitha-Kamath <[email protected]>
1 parent dfe4702 commit c494838

File tree

2 files changed

+21
-13
lines changed

2 files changed

+21
-13
lines changed

Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@ RUN go env -w GOBIN='/go/bin'
1717

1818
ENV CONTROLLER_GEN_VERSION v0.9.2
1919

20-
RUN cp /cachi2/output/deps/generic/helm-linux-${BUILDPLATFORM} /usr/bin/helm
20+
# Helm installation as per https://helm.sh/docs/intro/install/
21+
RUN tar -zxvf /cachi2/output/deps/generic/helm-linux-${BUILDPLATFORM}.tar.gz \
22+
&& mv ./linux-${BUILDPLATFORM}/helm /usr/bin/helm
23+
24+
#RUN cp /cachi2/output/deps/generic/helm-linux-${BUILDPLATFORM}.tar.gz ./ \
25+
# && tar -zxvf helm-linux-${BUILDPLATFORM}.tar.gz \
26+
# && mv ./linux-amd64/helm /usr/bin/helm
2127

2228
#RUN GOFLAGS="-mod=mod" go install sigs.k8s.io/controller-tools/cmd/controller-gen@$CONTROLLER_GEN_VERSION \
2329
# && GOFLAGS="-mod=mod" go install github.com/mitchellh/[email protected] \
@@ -59,6 +65,8 @@ RUN groupadd --gid $UID $USERNAME \
5965
&& chown -R $USERNAME:$USERNAME /var/lib/alloy \
6066
&& chmod -R 770 /var/lib/alloy
6167

68+
COPY alloy/LICENSE /licenses/
69+
6270
# Standard Red Hat labels
6371
LABEL com.redhat.component="alloy-container"
6472
LABEL name="alloy"

artifacts.lock.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
metadata:
33
version: "1.0"
44
artifacts:
5-
- download_url: "https://mirror.openshift.com/pub/openshift-v4/clients/helm/latest/helm-linux-amd64"
6-
checksum: "sha256:ef6c04f6a748d0f1d624a94a56dc0db83f8d70a65e3dbb19e94107126efcc5fd"
7-
filename: "helm-darwin-amd64"
8-
- download_url: "https://mirror.openshift.com/pub/openshift-v4/clients/helm/latest/helm-linux-arm64"
9-
checksum: "sha256:16f0f770143c1134914d778ca8c86fccf5e2ff7c65ac8dceb8de16e93c2430c9"
10-
filename: "helm-linux-arm64"
11-
- download_url: "https://mirror.openshift.com/pub/openshift-v4/clients/helm/latest/helm-linux-ppc64le"
12-
checksum: "sha256:0d58cf9a468fb0b43928e3b6a36125480217a5e1592b97f94046a15c988947e4"
13-
filename: "helm-linux-ppc64le"
14-
- download_url: "https://mirror.openshift.com/pub/openshift-v4/clients/helm/latest/helm-linux-s390x"
15-
checksum: "sha256:ab23b83d74ad7da525d0c9c6a9f6cfed8614210fc9f8ade9495acfa012acfeb5"
16-
filename: "helm-linux-s390x"
5+
- download_url: "https://get.helm.sh/helm-v3.19.0-linux-amd64.tar.gz"
6+
checksum: "sha256:a7f81ce08007091b86d8bd696eb4d86b8d0f2e1b9f6c714be62f82f96a594496"
7+
filename: "helm-linux-amd64.tar.gz"
8+
- download_url: "https://get.helm.sh/helm-v3.19.0-linux-arm64.tar.gz"
9+
checksum: "sha256:440cf7add0aee27ebc93fada965523c1dc2e0ab340d4348da2215737fc0d76ad"
10+
filename: "helm-linux-arm64.tar.gz"
11+
- download_url: "https://get.helm.sh/helm-v3.19.0-linux-ppc64le.tar.gz"
12+
checksum: "sha256:f57ea04d7fa62cc3e90a831eb67edb1400c810df6083875bee3a7c195a795ce4"
13+
filename: "helm-linux-ppc64le.tar.gz"
14+
- download_url: "https://get.helm.sh/helm-v3.19.0-linux-s390x.tar.gz"
15+
checksum: "sha256:0dff2f249f71690e3b420ebb5efc573eb26a51b4a614c4391c8c7fa3e47863f2"
16+
filename: "helm-linux-s390x.tar.gz"

0 commit comments

Comments
 (0)