update dockerfile and k8s
This commit is contained in:
+1
-6
@@ -91,10 +91,7 @@ RUN set -eux; \
|
|||||||
mkdir -p /artifacts; \
|
mkdir -p /artifacts; \
|
||||||
for bin in backend worker webdav admin; do \
|
for bin in backend worker webdav admin; do \
|
||||||
cp "target/${TARGET}/release/${bin}" "/artifacts/${bin}"; \
|
cp "target/${TARGET}/release/${bin}" "/artifacts/${bin}"; \
|
||||||
done; \
|
done
|
||||||
cargo install diesel_cli --locked --no-default-features --features postgres --target "${TARGET}" --root /tmp/diesel-install; \
|
|
||||||
cp /tmp/diesel-install/bin/diesel /artifacts/diesel; \
|
|
||||||
rm -rf /tmp/diesel-install
|
|
||||||
|
|
||||||
RUN set -eux; \
|
RUN set -eux; \
|
||||||
case "${TARGETARCH}" in \
|
case "${TARGETARCH}" in \
|
||||||
@@ -134,11 +131,9 @@ COPY --from=builder /artifacts/backend /usr/local/bin/papercrate-backend
|
|||||||
COPY --from=builder /artifacts/worker /usr/local/bin/papercrate-worker
|
COPY --from=builder /artifacts/worker /usr/local/bin/papercrate-worker
|
||||||
COPY --from=builder /artifacts/webdav /usr/local/bin/papercrate-webdav
|
COPY --from=builder /artifacts/webdav /usr/local/bin/papercrate-webdav
|
||||||
COPY --from=builder /artifacts/admin /usr/local/bin/papercrate-admin
|
COPY --from=builder /artifacts/admin /usr/local/bin/papercrate-admin
|
||||||
COPY --from=builder /artifacts/diesel /usr/local/bin/diesel
|
|
||||||
COPY --from=builder /artifacts/libpdfium.so /usr/local/lib/libpdfium.so
|
COPY --from=builder /artifacts/libpdfium.so /usr/local/lib/libpdfium.so
|
||||||
RUN ldconfig
|
RUN ldconfig
|
||||||
COPY migrations ./migrations
|
COPY migrations ./migrations
|
||||||
COPY diesel.toml ./
|
|
||||||
|
|
||||||
ENV RUST_LOG=info
|
ENV RUST_LOG=info
|
||||||
USER appuser
|
USER appuser
|
||||||
|
|||||||
@@ -29,8 +29,8 @@ spec:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
containers:
|
containers:
|
||||||
- name: webdav
|
- name: webdav
|
||||||
image: {{ include "papercrate.webdav.image" . }}:{{ include "papercrate.image.tag" (dict "image" .Values.webdav.image "Chart" .Chart) }}
|
image: {{ include "papercrate.backend.image" . }}:{{ include "papercrate.image.tag" (dict "image" .Values.backend.image "Chart" .Chart) }}
|
||||||
imagePullPolicy: {{ .Values.webdav.image.pullPolicy }}
|
imagePullPolicy: {{ .Values.backend.image.pullPolicy }}
|
||||||
command:
|
command:
|
||||||
- /usr/local/bin/papercrate-webdav
|
- /usr/local/bin/papercrate-webdav
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
Reference in New Issue
Block a user