Skip to content

Commit

Permalink
chore: synchronize workspaces
Browse files Browse the repository at this point in the history
  • Loading branch information
aeneasr committed Jan 8, 2024
1 parent 05effaa commit 4f901d6
Showing 1 changed file with 14 additions and 13 deletions.
27 changes: 14 additions & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ARG OSX_SDK=MacOSX11.3.sdk
# OSX-cross parameters. Go 1.15 requires OSX >= 10.11
ARG OSX_VERSION_MIN=11.3
# Choose latest commit from here: https://github.com/tpoechtrager/osxcross/commits/master/CHANGELOG
ARG OSX_CROSS_COMMIT=3351f5573c5c3f38a28a82df1ae09cad6d70f83d
ARG OSX_CROSS_COMMIT=c0cb74c8c01a66be0b6d05788f05201d87d9df9f

# Libtool parameters
ARG LIBTOOL_VERSION=2.4.6_4
Expand Down Expand Up @@ -43,15 +43,16 @@ FROM base AS osx-cross-base
ARG DEBIAN_FRONTEND=noninteractive
# Dependencies for https://github.com/tpoechtrager/osxcross:
# TODO split these into "build-time" and "runtime" dependencies so that build-time deps do not end up in the final image
RUN apt-get update -qq && apt-get install -y -q --no-install-recommends \
RUN apt-get update -qq
RUN apt-get install -y -q --no-install-recommends \
clang \
file \
llvm \
patch \
xz-utils \
cmake make libssl-dev lzma-dev libxml2-dev \
gcc g++ zlib1g-dev libmpc-dev libmpfr-dev libgmp-dev \
&& rm -rf /var/lib/apt/lists/*
gcc g++ zlib1g-dev libmpc-dev libmpfr-dev libgmp-dev
RUN rm -rf /var/lib/apt/lists/*

FROM osx-cross-base AS osx-cross
ARG OSX_CROSS_COMMIT
Expand Down Expand Up @@ -98,19 +99,19 @@ RUN apt-get update -y \
nodejs \
build-essential \
docker-ce docker-ce-cli containerd.io \
gcc cpp gcc-8 binutils \
&& apt-get update -y \
&& apt-get install -y \
gcc cpp gcc-8 binutils
RUN apt-get update -y
RUN apt-get install -y \
gcc-aarch64-linux-gnu \
gcc-arm-linux-gnueabihf \
&& rm -rf /var/lib/apt/lists/*
gcc-arm-linux-gnueabihf
RUN rm -rf /var/lib/apt/lists/*

# Install libusl with arm support which is only available on "bookworm"
RUN echo "deb http://ftp.us.debian.org/debian bookworm main" >> /etc/apt/sources.list
RUN apt-get update -y \
&& apt-get install -y \
musl-tools \
&& rm -rf /var/lib/apt/lists/*
RUN apt-get update -y
RUN apt-get install -y \
musl-tools
RUN rm -rf /var/lib/apt/lists/*

ARG GORELEASER_VERSION=1.23.0

Expand Down

0 comments on commit 4f901d6

Please sign in to comment.