From 0fb20d94d59e3acbf978879db4b55723d2a3f5b2 Mon Sep 17 00:00:00 2001
From: worm <worm@worm.worm>
Date: Sun, 17 Dec 2023 06:00:50 +0000
Subject: [PATCH] CGO is fine in all these cases

---
 lyrebird/Containerfile             | 2 +-
 snowflake-standalone/Containerfile | 4 ++--
 snowflake/Containerfile            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lyrebird/Containerfile b/lyrebird/Containerfile
index 56a0eba..c2e41d1 100644
--- a/lyrebird/Containerfile
+++ b/lyrebird/Containerfile
@@ -5,7 +5,7 @@ RUN git clone --depth=1 --branch=${VERSION} https://gitlab.torproject.org/tpo/an
 
 FROM --platform=$BUILDPLATFORM docker.io/library/golang:alpine AS build
 ARG TARGETOS TARGETARCH
-ENV GOOS="$TARGETOS" GOARCH="$TARGETARCH" GOFLAGS="-buildvcs=false -trimpath" CGO_ENABLED=0
+ENV GOOS="$TARGETOS" GOARCH="$TARGETARCH" GOFLAGS="-buildvcs=false -trimpath"
 COPY --from=source /go/src /go/src
 WORKDIR /go/src
 RUN --mount=type=cache,target=/go/pkg go mod download
diff --git a/snowflake-standalone/Containerfile b/snowflake-standalone/Containerfile
index dc1dc32..9a0ba47 100644
--- a/snowflake-standalone/Containerfile
+++ b/snowflake-standalone/Containerfile
@@ -5,13 +5,13 @@ RUN git clone --depth=1 --branch=${VERSION} https://gitlab.torproject.org/tpo/an
 
 FROM --platform=$BUILDPLATFORM docker.io/library/golang:alpine AS build
 ARG TARGETOS TARGETARCH
-ENV GOOS="$TARGETOS" GOARCH="$TARGETARCH" GOFLAGS="-buildvcs=false -trimpath" CGO_ENABLED=0
+ENV GOOS="$TARGETOS" GOARCH="$TARGETARCH" GOFLAGS="-buildvcs=false -trimpath"
 COPY --from=source /go/src /go/src
 WORKDIR /go/src/proxy
 RUN --mount=type=cache,target=/go/pkg go mod download
 RUN --mount=type=cache,target=/go/pkg --mount=type=cache,target=/root/.cache/go-build go build -ldflags '-w -s -buildid=' .
 
-FROM docker.io/library/alpine:latest
+FROM ghcr.io/cyberworm-uk/base:latest
 RUN apk --no-cache --no-interactive add ca-certificates tzdata
 COPY --from=build /go/src/proxy/proxy /bin/proxy
 USER 1000
diff --git a/snowflake/Containerfile b/snowflake/Containerfile
index ff614bb..9ebf019 100644
--- a/snowflake/Containerfile
+++ b/snowflake/Containerfile
@@ -5,7 +5,7 @@ RUN git clone --depth=1 --branch=${VERSION} https://gitlab.torproject.org/tpo/an
 
 FROM --platform=$BUILDPLATFORM docker.io/library/golang:alpine AS build
 ARG TARGETOS TARGETARCH
-ENV GOOS="$TARGETOS" GOARCH="$TARGETARCH" GOFLAGS="-buildvcs=false -trimpath" CGO_ENABLED=0
+ENV GOOS="$TARGETOS" GOARCH="$TARGETARCH" GOFLAGS="-buildvcs=false -trimpath"
 COPY --from=source /go/src /go/src
 WORKDIR /go/src/client
 RUN --mount=type=cache,target=/go/pkg go mod download