Skip to content

Commit

Permalink
Remove private repos (#4078)
Browse files Browse the repository at this point in the history
Signed-off-by: Yee Hing Tong <[email protected]>
  • Loading branch information
wild-endeavor committed Oct 11, 2023
1 parent df3b046 commit 5d54379
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 2,639 deletions.
12 changes: 0 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ FROM --platform=${BUILDPLATFORM} golang:1.19.1-bullseye AS flytebuilder
ARG TARGETARCH
ENV GOARCH "${TARGETARCH}"
ENV GOOS linux
ENV GOPRIVATE github.com/unionai/*
RUN mkdir -m 0700 ~/.ssh
RUN ssh-keyscan github.com >> ~/.ssh/known_hosts


WORKDIR /flyteorg/build

COPY datacatalog datacatalog
Expand All @@ -24,13 +19,6 @@ COPY flytestdlib flytestdlib

COPY go.mod go.sum ./
RUN go mod download
RUN echo '\
[url "ssh://[email protected]/"]\n\
insteadOf = https://github.com/'\
>> /root/.gitconfig

COPY go.mod go.sum ./
RUN --mount=type=ssh go mod download
COPY cmd cmd
COPY --from=flyteconsole /app/ cmd/single/dist
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/root/go/pkg/mod \
Expand Down
13 changes: 12 additions & 1 deletion docker/sandbox-bundled/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ manifests:
kustomize/complete-agent > manifests/complete-agent.yaml

.PHONY: build
build: manifests
build: flyte manifests
[ -n "$(shell docker buildx ls | awk '/^flyte-sandbox / {print $$1}')" ] || \
docker buildx create --name flyte-sandbox \
--driver docker-container --driver-opt image=moby/buildkit:master \
Expand All @@ -43,6 +43,17 @@ build: manifests
docker buildx build --ssh default --builder flyte-sandbox --allow security.insecure --load \
--tag flyte-sandbox:latest .

# This is here because we want to be able to push locally, not depend on GH actions
.PHONY: build_push
build_push: flyte manifests
[ -n "$(shell docker buildx ls | awk '/^flyte-sandbox / {print $$1}')" ] || \
docker buildx create --name flyte-sandbox \
--driver docker-container --driver-opt image=moby/buildkit:master \
--buildkitd-flags '--allow-insecure-entitlement security.insecure' \
--platform linux/arm64,linux/amd64
docker buildx build --ssh default --builder flyte-sandbox --allow security.insecure --push \
--tag ghcr.io/flyteorg/flyte-sandbox:a_v0.1.1 .

# Port map
# 6443 - k8s API server
# 30000 - Docker Registry
Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox-bundled/manifests/complete.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,7 @@ type: Opaque
---
apiVersion: v1
data:
haSharedSecret: c0x0OEoydzRPM3NtTjFNcw==
haSharedSecret: Tm9IU3lEa0NLZDB0blM5TQ==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -1747,7 +1747,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: f4d2d78b590a3d59ef184a10cb1180989e188ed28941d9ec4954d3978637266c
checksum/secret: 877fe97609c6f425701bda477b1165c1d2fbc0939da9a118b87b0430a0c8e713
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox-bundled/manifests/dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ metadata:
---
apiVersion: v1
data:
haSharedSecret: TmhYYmh4Q1NRdjRXUzNndg==
haSharedSecret: VTJWMndkSk15emRBZ3F0eg==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -1304,7 +1304,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: 9b814fd455aae8fc2518d7ec0636b402e4c6bc840c669992cdb8adca25ad6239
checksum/secret: f0e226e3dc585d5f35bb7081b38d51f46a2c9f90802717e69fb70ee70e18178c
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ require (
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cloudevents/sdk-go/binding/format/protobuf/v2 v2.8.0 // indirect
github.com/cloudevents/sdk-go/protocol/kafka_sarama/v2 v2.8.0 // indirect
github.com/cloudevents/sdk-go/v2 v2.8.0 // indirect
github.com/coocood/freecache v1.1.1 // indirect
Expand Down
220 changes: 0 additions & 220 deletions go.mod.main

This file was deleted.

5 changes: 1 addition & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575/go.mod h1:9d6lWj8KzO/fd/NrVaLscBKmPigpZpn5YawRPw+e3Yo=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cloudevents/sdk-go/binding/format/protobuf/v2 v2.8.0 h1:hRguaVL9rVsO8PMOpKSZ5gYZ2kjGRCvuKw4yMlfsBtg=
github.com/cloudevents/sdk-go/binding/format/protobuf/v2 v2.8.0/go.mod h1:Ba4CS2d+naAK8tGd6nm5ftGIWuHim+1lryAaIxhuh1k=
github.com/cloudevents/sdk-go/protocol/kafka_sarama/v2 v2.8.0 h1:48wFAj3LK/G80FqXgKzyciQF9BU3W+RwucGwWY1Tk0M=
github.com/cloudevents/sdk-go/protocol/kafka_sarama/v2 v2.8.0/go.mod h1:m41mqM/Pa9pzPPNrvWwY3M7llCuzciKk5tqH0m6Rz9I=
github.com/cloudevents/sdk-go/v2 v2.8.0 h1:kmRaLbsafZmidZ0rZ6h7WOMqCkRMcVTLV5lxV/HKQ9Y=
Expand Down Expand Up @@ -1518,10 +1519,6 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/unionai/cron/v3 v3.0.2-0.20220915080349-5790c370e63a h1:pTbOzzOh94yt3WHt7uqZ1m6PUZth++GspSJGK9dEBC4=
github.com/unionai/cron/v3 v3.0.2-0.20220915080349-5790c370e63a/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
github.com/unionai/flyteadmin v1.1.115-0.20230922220028-90b279296f02 h1:UT7+HmFEo5trdkI3R9TWGHhfeCJTICAXiOvcc4ZhYpA=
github.com/unionai/flyteadmin v1.1.115-0.20230922220028-90b279296f02/go.mod h1:DoYsyQ2kEoOEt+xnRC96foR1eTVfKgOy1DRPLkgPh/Y=
github.com/unionai/flyteidl v1.5.14-0.20230916200054-78caf2c2eeb3 h1:GznIW2znW7PeixgNbSJxNIajqB5LlL98uEBOPA99HGI=
github.com/unionai/flyteidl v1.5.14-0.20230916200054-78caf2c2eeb3/go.mod h1:EtE/muM2lHHgBabjYcxqe9TWeJSL0kXwbI0RgVwI4Og=
github.com/unrolled/secure v0.0.0-20180918153822-f340ee86eb8b/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA=
github.com/unrolled/secure v0.0.0-20181005190816-ff9db2ff917f/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
Expand Down
Loading

0 comments on commit 5d54379

Please sign in to comment.