Skip to content

Commit

Permalink
[Chore] Bump alpine image
Browse files Browse the repository at this point in the history
Problem: For some reason, binary build on alpine 3.12
results in segmentation fault for baker binary.

Solution: Bump it.
  • Loading branch information
krendelhoff2 committed Feb 22, 2023
1 parent 5dcf02e commit 8ca8061
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 28 deletions.
6 changes: 2 additions & 4 deletions docker/build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
# SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>
#
# SPDX-License-Identifier: LicenseRef-MIT-TQ
FROM alpine:3.12
FROM alpine:3.17
RUN apk update
RUN apk --no-cache --virtual add rsync git m4 build-base patch unzip \
bubblewrap wget pkgconfig gmp-dev libev-dev \
hidapi-dev eudev-dev perl opam libusb-dev bash \
autoconf automake libtool linux-headers cargo \
libffi-dev zlib-static coreutils perl-utils cmake
COPY ./build/build-libusb-and-hidapi.sh /build-libusb-and-hidapi.sh
RUN /build-libusb-and-hidapi.sh
libffi-dev zlib-dev zlib-static coreutils perl-utils cmake
COPY ./build/build-rust.sh /build-rust.sh
RUN /build-rust.sh
COPY ./build/build-upx.sh /build-upx.sh
Expand Down
6 changes: 2 additions & 4 deletions docker/build/Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@ FROM alpine:3.12 as binary-fetch
RUN wget https://github.com/multiarch/qemu-user-static/releases/download/v4.2.0-7/qemu-aarch64-static
RUN chmod +x qemu-aarch64-static

FROM arm64v8/alpine:3.12 as builder
FROM arm64v8/alpine:3.17 as builder
COPY --from=binary-fetch qemu-aarch64-static /usr/bin/qemu-aarch64-static
RUN apk update
RUN apk --no-cache --virtual add rsync git m4 build-base patch unzip \
bubblewrap wget pkgconfig gmp-dev libev-dev \
hidapi-dev eudev-dev perl opam libusb-dev bash \
autoconf automake libtool linux-headers cargo \
libffi-dev zlib-static coreutils perl-utils cmake
COPY ./build/build-libusb-and-hidapi.sh /build-libusb-and-hidapi.sh
RUN /build-libusb-and-hidapi.sh
libffi-dev zlib-dev zlib-static coreutils perl-utils cmake
COPY ./build/build-rust.sh /build-rust.sh
RUN /build-rust.sh
COPY ./build/build-upx.sh /build-upx.sh
Expand Down
20 changes: 0 additions & 20 deletions docker/build/build-libusb-and-hidapi.sh

This file was deleted.

0 comments on commit 8ca8061

Please sign in to comment.