mirror/lldap
1
0
Fork 0
mirror of https://github.com/nitnelave/lldap.git synced 2023-04-12 14:25:13 +00:00
Code Issues Projects Releases Wiki Activity

remove cmd, some fixup

Browse Source
This commit is contained in:
Dedy Martadinata Supriyadi 2022-07-14 00:59:30 +07:00
parent 1191b37df6
commit 5a1ea9055d
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Dockerfile
View File

@ -2,7 +2,7 @@
FROM rust:1.62-slim-bullseye AS builder-base FROM rust:1.62-slim-bullseye AS builder-base
# Set env for our builder # Set env for our builder
ENV CARGO_TERM_COLOR=always \ ENV CARGO_TERM_COLOR="always" \
RUSTFLAGS="-Ctarget-feature=+crt-static" \ RUSTFLAGS="-Ctarget-feature=+crt-static" \
OPENSSL_INCLUDE_DIR="/usr/include/openssl/" \ OPENSSL_INCLUDE_DIR="/usr/include/openssl/" \
CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER="arm-linux-gnueabihf-gcc" \ CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER="arm-linux-gnueabihf-gcc" \
@ -62,9 +62,9 @@ RUN cargo chef prepare --recipe-path /tmp/recipe.json
# Build depedencies # Build depedencies
FROM builder-base AS builder FROM builder-base AS builder
COPY --from=planner /tmp/recipe.json recipe.json COPY --from=planner /tmp/recipe.json recipe.json
RUN RUSTFLAGS="-Ctarget-feature=-crt-static" cargo chef cook --release -p migration-tool
RUN RUSTFLAGS="-Ctarget-feature=-crt-static" cargo chef cook --release -p lldap_app --target wasm32-unknown-unknown RUN RUSTFLAGS="-Ctarget-feature=-crt-static" cargo chef cook --release -p lldap_app --target wasm32-unknown-unknown
RUN RUSTFLAGS="-Ctarget-feature=-crt-static" cargo chef cook --release -p lldap RUN RUSTFLAGS="-Ctarget-feature=-crt-static" cargo chef cook --release -p lldap
RUN RUSTFLAGS="-Ctarget-feature=-crt-static" cargo chef cook --release -p migration-tool
WORKDIR /lldap-src WORKDIR /lldap-src
COPY . . COPY . .
@ -94,9 +94,6 @@ RUN cp target/*/release/lldap /lldap/lldap && \
app/pkg \ app/pkg \
app/static \ app/static \
/lldap/app/ /lldap/app/
# Just checking
RUN ls -al /lldap && \
ls -al /lldap/app
# Fetch our fonts # Fetch our fonts
WORKDIR /lldap WORKDIR /lldap
RUN set -x \ RUN set -x \
@ -109,9 +106,9 @@ RUN set -x \
### Final image ### Final image
FROM alpine:3.16 FROM alpine:3.16
WORKDIR /app WORKDIR /app
ENV UID=1000 ENV UID=1000 \
ENV GID=1000 GID=1000 \
ENV USER=lldap USER=lldap
RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories && \ RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories && \
apk add --no-cache tini ca-certificates bash gosu && \ apk add --no-cache tini ca-certificates bash gosu && \
addgroup -g $GID $USER && \ addgroup -g $GID $USER && \
@ -131,4 +128,4 @@ COPY --from=builder --chown=$USER:$USER /docker-entrypoint.sh /docker-entrypoint
VOLUME ["/data"] VOLUME ["/data"]
WORKDIR /app WORKDIR /app
ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"] ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]
CMD ["run", "--config-file", "/data/lldap_config.toml"] #CMD ["run", "--config-file", "/data/lldap_config.toml"]

2
docker-entrypoint.sh
View File

@ -42,6 +42,6 @@ find /data \! -user "$UID" -exec chown "$UID:$GID" '{}' +
echo "> Starting lldap.." echo "> Starting lldap.."
echo "" echo ""
exec gosu "$UID:$GID" /app/lldap "$@" exec gosu "$UID:$GID" /app/lldap run --config-file /data/lldap_config.toml
exec "$@" exec "$@"