From 8a68f3aa711844cd1da216e41778e13c851f9be9 Mon Sep 17 00:00:00 2001 From: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> Date: Mon, 15 May 2023 05:19:24 -0700 Subject: [PATCH] Remove unused dockerfile --- zig-build/.dockerignore | 1 - zig-build/Dockerfile | 61 --------------------------------------- zig-build/Dockerfile.musl | 26 ----------------- zig-build/release.sh | 58 ------------------------------------- 4 files changed, 146 deletions(-) delete mode 100644 zig-build/.dockerignore delete mode 100644 zig-build/Dockerfile delete mode 100644 zig-build/Dockerfile.musl delete mode 100644 zig-build/release.sh diff --git a/zig-build/.dockerignore b/zig-build/.dockerignore deleted file mode 100644 index 72e8ffc0db..0000000000 --- a/zig-build/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/zig-build/Dockerfile b/zig-build/Dockerfile deleted file mode 100644 index e8f010f648..0000000000 --- a/zig-build/Dockerfile +++ /dev/null @@ -1,61 +0,0 @@ - -# This builds the specific version of Zig used by bun -# It outputs a zig.zip file -FROM ubuntu:18.04 - -RUN apt-get update && apt-get install --no-install-recommends -y wget gnupg2 curl lsb-release wget software-properties-common -RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - - -RUN wget https://apt.llvm.org/llvm.sh --no-check-certificate -RUN chmod +x llvm.sh -RUN ./llvm.sh 13 - -RUN apt-get update && apt-get install --no-install-recommends -y \ - ca-certificates \ - curl \ - gnupg2 \ - software-properties-common \ - cmake \ - build-essential \ - git \ - libssl-dev \ - liblld-13-dev \ - libclang-13-dev \ - gcc \ - g++ \ - clang-13 \ - clang-format-13 \ - libc++-13-dev \ - libc++abi-13-dev \ - lld-13 \ - zip - -RUN update-alternatives --install /usr/bin/ld ld /usr/bin/lld-13 90 && \ - update-alternatives --install /usr/bin/cc cc /usr/bin/clang-13 90 && \ - update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++-13 90 && \ - update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-13 90 - - -ENV CC=clang-13 -ENV CXX=clang++-13 - -RUN mkdir /output; -WORKDIR /output -ARG TAG "jul7" - -# Compile zig -RUN --mount=type=tmpfs,target=/zig-build \ - cd /zig-build && \ - mkdir -p /zig-build; \ - git clone https://github.com/oven-sh/zig.git --depth=1; \ - cd /zig-build/zig; \ - cmake . -DCMAKE_BUILD_TYPE=Release && \ - make -j$(nproc) && \ - rm -rf .git; \ - cd /zig-build; \ - zip -r zig.zip zig; \ - echo "${TAG}" > /output/.zig-version; \ - cp zig.zip /output; - - - diff --git a/zig-build/Dockerfile.musl b/zig-build/Dockerfile.musl deleted file mode 100644 index 76e359116d..0000000000 --- a/zig-build/Dockerfile.musl +++ /dev/null @@ -1,26 +0,0 @@ -FROM alpine:3.15 as base - -RUN apk update -RUN apk add --no-cache cmake make clang clang-static clang-dev llvm12-dev llvm12-static musl-dev git lld libgcc gcc g++ libstdc++ build-base lld-dev lld-static llvm12-libs libc-dev xz zlib zlib-dev libxml2 libxml2-dev - -ENV CXX=clang++ -ENV CC=clang -ENV LDFLAGS='-L/usr/include -L/usr/include/llvm12' -ENV CXXFLAGS="-I/usr/include -I/usr/include/llvm12" -ENV PATH="/usr/bin:/usr/local/bin:/zig/bin:$PATH" - -FROM base as zig - -# Compile zig -RUN --mount=type=tmpfs,target=/zig-build mkdir /zig; \ - cd /zig-build && \ - mkdir -p /zig-build; \ - git clone -b jarred/zig-sloppy-with-small-structs --single-branch --depth=1 https://github.com/oven-sh/zig.git .; \ - cd /zig-build; \ - cmake . -DZIG_STATIC_LLVM=ON -DLLVM_INCLUDE_DIRS=$LLVM_INCLUDE_DIRS -DCMAKE_BUILD_TYPE=Release && \ - make -j$(nproc) && make install && \ - rm -rf .git && \ - cd /zig-build && \ - cp -r /zig-build/bin /zig/bin && \ - cp -r /zig-build/lib /zig/lib - diff --git a/zig-build/release.sh b/zig-build/release.sh deleted file mode 100644 index c879311015..0000000000 --- a/zig-build/release.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env bash - -set -euxo pipefail - -export DOCKER_BUILDKIT=1 - -export BUILDKIT_ARCH=$(uname -m) -export ARCH=${BUILDKIT_ARCH} - -if [ "$BUILDKIT_ARCH" == "amd64" ]; then - export BUILDKIT_ARCH="amd64" - export ARCH=x64 -fi - -if [ "$BUILDKIT_ARCH" == "x86_64" ]; then - export BUILDKIT_ARCH="amd64" - export ARCH=x64 -fi - -if [ "$BUILDKIT_ARCH" == "arm64" ]; then - export BUILDKIT_ARCH="arm64" - export ARCH=aarch64 -fi - -if [ "$BUILDKIT_ARCH" == "aarch64" ]; then - export BUILDKIT_ARCH="arm64" - export ARCH=aarch64 -fi - -if [ "$BUILDKIT_ARCH" == "armv7l" ]; then - echo "Unsupported platform: $BUILDKIT_ARCH" - exit 1 -fi - -# Name should be $BUILDKIT_ARCH so we only need that arg passed -export CONTAINER_NAME=zig-linux-$BUILDKIT_ARCH -export TAG=mar4 - -temp=$(mktemp -d) - -docker build . -t $CONTAINER_NAME --progress=plain --platform=linux/$BUILDKIT_ARCH --build-arg TAG=$TAG - -if (($?)); then - echo "Failed to build container" - exit 1 -fi - -id=$(docker create $CONTAINER_NAME:latest) -docker cp $id:/output/zig.zip $temp/$CONTAINER_NAME.zip - -if (($?)); then - echo "Failed to cp out" - exit 1 -fi - -docker rm $id - -gh release upload $TAG $temp/$CONTAINER_NAME.zip --clobber --repo oven-sh/zig