Преглед изворни кода

Merge pull request #25972 from overleaf/msm-unvendor-envsubst

[git-bridge] Un-vendor `envsubst`

GitOrigin-RevId: 02abdd20aede8b6fd90013f4841ad3375997335c
Miguel Serrano пре 1 година
родитељ
комит
b8816848a0
2 измењених фајлова са 9 додато и 3 уклоњено
  1. 9 3
      services/git-bridge/Dockerfile
  2. BIN
      services/git-bridge/vendor/envsubst

+ 9 - 3
services/git-bridge/Dockerfile

@@ -1,11 +1,17 @@
-# Dockerfile for git-bridge
+# Build the a8m/envsubst binary, as it supports default values,
+# which the gnu envsubst (from gettext-base) does not.
+FROM golang:1.24.3-alpine AS envsubst_builder
+
+WORKDIR /build
+
+RUN go install github.com/a8m/envsubst/cmd/envsubst@latest
 
 
 FROM maven:3-amazoncorretto-21-debian AS base
 FROM maven:3-amazoncorretto-21-debian AS base
 
 
 RUN apt-get update && apt-get install -y make git sqlite3 \
 RUN apt-get update && apt-get install -y make git sqlite3 \
  && rm -rf /var/lib/apt/lists
  && rm -rf /var/lib/apt/lists
 
 
-COPY vendor/envsubst /opt/envsubst
+COPY --from=envsubst_builder /go/bin/envsubst /opt/envsubst
 RUN chmod +x /opt/envsubst
 RUN chmod +x /opt/envsubst
 
 
 RUN useradd --create-home node
 RUN useradd --create-home node
@@ -33,7 +39,7 @@ RUN adduser -D node
 
 
 COPY --from=builder /git-bridge.jar /
 COPY --from=builder /git-bridge.jar /
 
 
-COPY vendor/envsubst /opt/envsubst
+COPY --from=envsubst_builder /go/bin/envsubst /opt/envsubst
 RUN chmod +x /opt/envsubst
 RUN chmod +x /opt/envsubst
 
 
 COPY conf/envsubst_template.json envsubst_template.json
 COPY conf/envsubst_template.json envsubst_template.json

BIN
services/git-bridge/vendor/envsubst