Skip to content

Commit 890ce6c

Browse files
committed
install trivy from arch
1 parent fa65932 commit 890ce6c

5 files changed

Lines changed: 11 additions & 133 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ guard-%:
1212

1313
.PHONY: install install-python install-node install-hooks build-base-image build-node-24-image build-node-24-python-3-10-image build-node-24-python-3-12-image build-node-24-python-3-13-image build-node-24-python-3-14-image \
1414
build-eps-storage-terraform-image build-fhir-facade-image build-node-24-python-3-14-golang-1-24-image build-node-24-python-3-14-java-24-image \
15-
build-regression-tests-image build-all build-image build-githubactions-image scan-image scan-image-json shell-image lint test lint-githubactions lint-githubaction-scripts github-login clean
15+
build-regression-tests-image build-all build-image build-githubactions-image scan-image scan-image-json shell-image lint test lint-githubactions lint-githubaction-scripts clean
1616
install: install-python install-node install-hooks
1717

1818
install-python:

src/base/.devcontainer/Dockerfile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
FROM golang:1.26.1-bookworm AS build
1+
FROM archlinux:latest AS build
22
ARG TARGETARCH
3-
RUN apt-get update && apt-get install -y \
4-
jq \
5-
&& apt-get clean \
6-
&& rm -rf /var/lib/apt/lists/*
7-
COPY scripts/install_cosign.sh /tmp/install_cosign.sh
3+
RUN pacman -Sy --noconfirm cosign bash curl jq
84
COPY scripts/install_trivy.sh /tmp/install_trivy.sh
9-
RUN INSTALL_DIR=/usr/local/bin /tmp/install_cosign.sh
105
RUN case "${TARGETARCH}" in \
116
x86_64|amd64) TRIVY_ARCH=64bit ;; \
127
aarch64|arm64) TRIVY_ARCH=ARM64 ;; \

src/base/.devcontainer/Dockerfile.trivy.amd64

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
FROM golang:1.26.1-bookworm AS build
2-
RUN apt-get update && apt-get install -y \
3-
jq \
4-
&& apt-get clean \
5-
&& rm -rf /var/lib/apt/lists/*
6-
COPY src/base/.devcontainer/scripts/install_cosign.sh /tmp/install_cosign.sh
7-
COPY src/base/.devcontainer/scripts/install_trivy.sh /tmp/install_trivy.sh
8-
RUN INSTALL_DIR=/usr/local/bin /tmp/install_cosign.sh
1+
FROM archlinux:latest AS build
2+
ARG TARGETARCH
3+
RUN pacman -Sy --noconfirm cosign bash curl jq
4+
COPY scripts/install_trivy.sh /tmp/install_trivy.sh
95
RUN INSTALL_DIR=/tmp/trivy/ ARCH=64bit /tmp/install_trivy.sh
106

117
FROM scratch

src/base/.devcontainer/Dockerfile.trivy.arm64

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
FROM golang:1.26.1-bookworm AS build
2-
RUN apt-get update && apt-get install -y \
3-
jq \
4-
&& apt-get clean \
5-
&& rm -rf /var/lib/apt/lists/*
6-
COPY src/base/.devcontainer/scripts/install_cosign.sh /tmp/install_cosign.sh
7-
COPY src/base/.devcontainer/scripts/install_trivy.sh /tmp/install_trivy.sh
8-
RUN INSTALL_DIR=/usr/local/bin /tmp/install_cosign.sh
1+
FROM archlinux:latest AS build
2+
ARG TARGETARCH
3+
RUN pacman -Sy --noconfirm cosign bash curl jq
4+
COPY scripts/install_trivy.sh /tmp/install_trivy.sh
95
RUN INSTALL_DIR=/tmp/trivy/ ARCH=ARM64 /tmp/install_trivy.sh
106

117
FROM scratch

src/base/.devcontainer/scripts/install_cosign.sh

Lines changed: 0 additions & 109 deletions
This file was deleted.

0 commit comments

Comments
 (0)