Skip to content

Commit 51067b1

Browse files
maxbrunetmaxbrunet
authored
build: fix silent container build failure and lint (parca-dev#465)
1 parent 3d97faa commit 51067b1

File tree

4 files changed

+66
-54
lines changed

4 files changed

+66
-54
lines changed

‎.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ insert_final_newline = true
99
[*.go]
1010
indent_style = tab
1111

12-
[*.rs]
12+
[*.{rs,sh}]
1313
indent_style = space
1414
indent_size = 4

‎Dockerfile

+28-15
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,66 @@
1-
ARG GOLANG_BASE
2-
ARG DEBIAN_BASE
3-
4-
FROM ${GOLANG_BASE} as build
1+
FROM docker.io/golang:1.18.1-bullseye@sha256:3b1a72af045ad0fff9fe8e00736baae76d70ff51325ac5bb814fe4754044b972 AS build
52

63
# tag=1.24.3
74
ARG RUSTUP_VERSION=ce5817a94ac372804babe32626ba7fd2d5e1b6ac
85

96
# For more information about the snapshots, see: https://snapshot.debian.org/
10-
RUN echo "\
7+
RUN printf '\
118
deb http://snapshot.debian.org/archive/debian/20220420T025302Z bullseye main\n\
129
deb http://snapshot.debian.org/archive/debian/20220420T025302Z bullseye-updates main\n\
1310
deb http://snapshot.debian.org/archive/debian/20220420T025302Z bullseye-backports main\n\
1411
deb http://snapshot.debian.org/archive/debian-security/20220420T025302Z bullseye-security main\n\
1512
deb http://snapshot.debian.org/archive/debian/20220420T025302Z sid main\n\
16-
" > /etc/apt/sources.list
13+
' > /etc/apt/sources.list
1714

18-
# NOTICE: -o Acquire::Check-Valid-Until="false" added as a mitigation, see https://github.com/parca-dev/parca-agent/issues/10 for further details.
15+
# NOTICE: -o Acquire::Check-Valid-Until="false" added as a mitigation,
16+
# see https://github.com/parca-dev/parca-agent/issues/10 for further details.
17+
# hadolint ignore=DL3008
1918
RUN apt-get -o Acquire::Check-Valid-Until="false" update -y && \
20-
apt-get install --no-install-recommends -yq llvm-14-dev libclang-14-dev clang-14 make gcc coreutils zlib1g-dev libelf-dev ca-certificates netbase && \
21-
ln -s /usr/bin/clang-14 /usr/bin/clang && \
22-
ln -s /usr/bin/llc-14 /usr/bin/llc
19+
apt-get install --no-install-recommends -yq \
20+
llvm-14-dev \
21+
libclang-14-dev \
22+
clang-14 \
23+
make \
24+
gcc \
25+
coreutils \
26+
zlib1g-dev \
27+
libelf-dev \
28+
ca-certificates \
29+
netbase && \
30+
ln -s /usr/bin/clang-14 /usr/bin/clang && \
31+
ln -s /usr/bin/llc-14 /usr/bin/llc
2332

2433
WORKDIR /parca-agent
2534

2635
# Install Rust
2736
COPY rust-toolchain.toml /parca-agent
37+
# SHELL is not supported for OCI image format
38+
# https://github.com/containers/buildah/blob/v1.26.1/config.go#L366-L377
39+
# hadolint ignore=DL4006
2840
RUN curl --proto '=https' --tlsv1.2 -sSf "https://raw.githubusercontent.com/rust-lang/rustup/${RUSTUP_VERSION}/rustup-init.sh" \
2941
| sh -s -- --default-toolchain none -y
3042
ENV PATH="/root/.cargo/bin:${PATH}"
3143
RUN rustup show
3244

33-
ARG ARCH
45+
ARG TARGETARCH=amd64
46+
ENV ARCH="${TARGETARCH}"
3447
ENV GOOS=linux
35-
ENV ARCH=$ARCH
36-
ENV GOARCH=$ARCH
48+
ENV GOARCH="${TARGETARCH}"
3749

3850
COPY go.mod go.sum /parca-agent/
3951
RUN go mod download -modcacherw
4052

41-
COPY Makefile /parca-agent/
53+
COPY Makefile /parca-agent
4254
COPY bpf /parca-agent/bpf
4355
RUN make -C bpf setup
56+
# hadolint ignore=DL3059
4457
RUN make bpf
4558

4659
COPY . /parca-agent
4760
RUN git submodule init && git submodule update
4861
RUN make build
4962

50-
FROM ${DEBIAN_BASE} as all
63+
FROM docker.io/debian:bullseye-slim@sha256:06a93cbdd49a265795ef7b24fe374fee670148a7973190fb798e43b3cf7c5d0f AS all
5164

5265
COPY --from=build /etc/nsswitch.conf /etc/nsswitch.conf
5366
COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt

‎Dockerfile.dev

+30-12
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,42 @@
1-
FROM golang:1.18.3-bullseye as build
1+
FROM docker.io/golang:1.18.1-bullseye@sha256:3b1a72af045ad0fff9fe8e00736baae76d70ff51325ac5bb814fe4754044b972 AS build
22

33
# tag=1.24.3
44
ARG RUSTUP_VERSION=ce5817a94ac372804babe32626ba7fd2d5e1b6ac
55

6-
RUN echo "\
6+
# For more information about the snapshots, see: https://snapshot.debian.org/
7+
RUN printf '\
78
deb http://snapshot.debian.org/archive/debian/20220420T025302Z bullseye main\n\
89
deb http://snapshot.debian.org/archive/debian/20220420T025302Z bullseye-updates main\n\
910
deb http://snapshot.debian.org/archive/debian/20220420T025302Z bullseye-backports main\n\
1011
deb http://snapshot.debian.org/archive/debian-security/20220420T025302Z bullseye-security main\n\
1112
deb http://snapshot.debian.org/archive/debian/20220420T025302Z sid main\n\
12-
" > /etc/apt/sources.list
13+
' > /etc/apt/sources.list
1314

15+
# NOTICE: -o Acquire::Check-Valid-Until="false" added as a mitigation,
16+
# see https://github.com/parca-dev/parca-agent/issues/10 for further details.
17+
# hadolint ignore=DL3008
1418
RUN apt-get -o Acquire::Check-Valid-Until="false" update -y && \
15-
apt-get install --no-install-recommends -yq llvm-14-dev libclang-14-dev clang-14 make gcc coreutils zlib1g-dev libelf-dev ca-certificates netbase && \
16-
ln -s /usr/bin/clang-14 /usr/bin/clang && \
17-
ln -s /usr/bin/llc-14 /usr/bin/llc
18-
19+
apt-get install --no-install-recommends -yq \
20+
llvm-14-dev \
21+
libclang-14-dev \
22+
clang-14 \
23+
make \
24+
gcc \
25+
coreutils \
26+
zlib1g-dev \
27+
libelf-dev \
28+
ca-certificates \
29+
netbase && \
30+
ln -s /usr/bin/clang-14 /usr/bin/clang && \
31+
ln -s /usr/bin/llc-14 /usr/bin/llc
1932

2033
WORKDIR /parca-agent
2134

2235
# Install Rust
23-
COPY rust-toolchain.toml /parca-agent/
36+
COPY rust-toolchain.toml /parca-agent
37+
# SHELL is not supported for OCI image format
38+
# https://github.com/containers/buildah/blob/v1.26.1/config.go#L366-L377
39+
# hadolint ignore=DL4006
2440
RUN curl --proto '=https' --tlsv1.2 -sSf "https://raw.githubusercontent.com/rust-lang/rustup/${RUSTUP_VERSION}/rustup-init.sh" \
2541
| sh -s -- --default-toolchain none -y
2642
ENV PATH="/root/.cargo/bin:${PATH}"
@@ -30,18 +46,20 @@ RUN rustup show
3046
COPY go.mod go.sum /parca-agent/
3147
RUN go mod download -modcacherw
3248

33-
COPY Makefile ./
34-
COPY 3rdparty ./3rdparty
35-
COPY bpf ./bpf
49+
COPY Makefile /parca-agent
50+
COPY 3rdparty /parca-agent/3rdparty
51+
COPY bpf /parca-agent/bpf
3652
RUN make -C bpf setup
53+
# hadolint ignore=DL3059
3754
RUN make bpf
3855

56+
# hadolint ignore=DL3059
3957
RUN go install github.com/go-delve/delve/cmd/[email protected]
4058

4159
COPY . /parca-agent
4260
RUN make build
4361

44-
FROM debian:bullseye-slim as all
62+
FROM docker.io/debian:bullseye-slim@sha256:06a93cbdd49a265795ef7b24fe374fee670148a7973190fb798e43b3cf7c5d0f AS all
4563

4664
COPY --from=build /etc/nsswitch.conf /etc/nsswitch.conf
4765
COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt

‎make-containers.sh

+7-26
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,14 @@
11
#!/usr/bin/env bash
2-
set +euxo pipefail
2+
set -euo pipefail
33

4-
MANIFEST="$1"
4+
MANIFEST="${1?Image name must be provided}"
55
ARCHS=('arm64' 'amd64')
66

7-
# podman manifest inspect docker.io/golang:1.18.1-bullseye
8-
# SHA order is respectively arm64, amd64
9-
DOCKER_GOLANG_SHAS=(
10-
'docker.io/golang@sha256:301d39546808488f001760626a904b6aa4bb6e8f94a79bdd43776d990ad6c28e'
11-
'docker.io/golang@sha256:ee752bc53c628ff789bacefb714cff721701042ffa9eb736f7b2ed4e9f2bdab6'
12-
)
13-
14-
# podman manifest inspect docker.io/debian:bullseye-slim
15-
# SHA order is respectively arm64, amd64
16-
DOCKER_DEBIAN_SHAS=(
17-
'docker.io/debian@sha256:fc7792ebc6819bf63f967a6039f2f35346e7fa8f3650f8dd58f596c3da1a9882'
18-
'docker.io/debian@sha256:fa4209bc498f3cf557c7d448f295d300aed44e7fd296fdd480a8ff5785cca305'
19-
)
20-
21-
for i in "${!ARCHS[@]}"; do
22-
ARCH=${ARCHS[$i]}
23-
DOCKER_GOLANG_SHA=${DOCKER_GOLANG_SHAS[$i]}
24-
DOCKER_DEBIAN_SHA=${DOCKER_DEBIAN_SHAS[$i]}
25-
echo "Building manifest for $MANIFEST with arch \"$ARCH\""
7+
for arch in "${ARCHS[@]}"; do
8+
printf 'Building manifest for %s with arch %s\n' "${MANIFEST}" "${arch}"
269
podman build \
27-
--build-arg GOLANG_BASE=$DOCKER_GOLANG_SHA \
28-
--build-arg DEBIAN_BASE=$DOCKER_DEBIAN_SHA \
29-
--build-arg ARCH=$ARCH \
30-
--arch $ARCH \
10+
--build-arg TARGETARCH="${arch}" \
11+
--arch "${arch}" \
3112
--timestamp 0 \
32-
--manifest $MANIFEST .; \
13+
--manifest "${MANIFEST}" .
3314
done

0 commit comments

Comments
 (0)