v1.0.4 — Ceph reader creds (hardcode), S3_USE_SSL ENV
This commit is contained in:
+7
-4
@@ -15,13 +15,16 @@ FROM alpine:3.21
|
|||||||
RUN apk --no-cache add ca-certificates
|
RUN apk --no-cache add ca-certificates
|
||||||
COPY --from=builder /app/registry /registry
|
COPY --from=builder /app/registry /registry
|
||||||
|
|
||||||
# ── Non-secret defaults (change here → rebuild → push → redeploy) ─────────
|
# ── TEMP: reader creds hardcoded for Ceph test ────────────────────────────
|
||||||
ENV S3_ENDPOINT=s3.msk-1.ngcloud.ru \
|
ENV S3_ENDPOINT=ceph.tst.nubes.ru \
|
||||||
S3_BUCKET=terraform-registry \
|
S3_BUCKET=terraform-registry \
|
||||||
S3_PREFIX=go-registry.containerk8s.dev.nubes.ru \
|
S3_PREFIX=go-registry.containerk8s.dev.nubes.ru \
|
||||||
REGISTRY_HOSTNAME=go-registry.containerk8s.dev.nubes.ru \
|
REGISTRY_HOSTNAME=go-registry.containerk8s.dev.nubes.ru \
|
||||||
PORT=5000
|
S3_USE_SSL=false \
|
||||||
# ── Secrets go in UI jsonEnv: S3_ACCESS_KEY, S3_SECRET_KEY ─────────────────
|
PORT=5000 \
|
||||||
|
S3_ACCESS_KEY=AAYTNYSZIM08DDWV3TK1 \
|
||||||
|
S3_SECRET_KEY=xQVd9CeGXACPIXTBTH4KV6DIHEAyySOFSTrS17Lc
|
||||||
|
# ── TODO: remove hardcoded keys, use jsonEnv for new instance ─────────────
|
||||||
|
|
||||||
EXPOSE 5000
|
EXPOSE 5000
|
||||||
CMD ["/registry"]
|
CMD ["/registry"]
|
||||||
|
|||||||
+3
-2
@@ -27,7 +27,7 @@ var (
|
|||||||
s3Prefix = os.Getenv("S3_PREFIX") // S3 key prefix (may differ from hostname)
|
s3Prefix = os.Getenv("S3_PREFIX") // S3 key prefix (may differ from hostname)
|
||||||
)
|
)
|
||||||
|
|
||||||
const VERSION = "1.0.3"
|
const VERSION = "1.0.4"
|
||||||
|
|
||||||
// Terraform Registry Protocol Structs
|
// Terraform Registry Protocol Structs
|
||||||
type Discovery struct {
|
type Discovery struct {
|
||||||
@@ -91,9 +91,10 @@ func main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var err error
|
var err error
|
||||||
|
useSSL := os.Getenv("S3_USE_SSL") != "false"
|
||||||
s3Client, err = s3.New(endpoint, &s3.Options{
|
s3Client, err = s3.New(endpoint, &s3.Options{
|
||||||
Creds: credentials.NewStaticV4(accessKeyID, secretAccessKey, ""),
|
Creds: credentials.NewStaticV4(accessKeyID, secretAccessKey, ""),
|
||||||
Secure: true, // Force secure for cloud S3
|
Secure: useSSL,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalln(err)
|
log.Fatalln(err)
|
||||||
|
|||||||
Reference in New Issue
Block a user