mirror of
https://github.com/lldap/lldap.git
synced 2024-11-25 09:06:03 +00:00
docker: Include bootstrap.sh in main image
This commit is contained in:
parent
7806ed34ff
commit
6d65a2546c
4 changed files with 5 additions and 2 deletions
3
.github/workflows/Dockerfile.ci.alpine-base
vendored
3
.github/workflows/Dockerfile.ci.alpine-base
vendored
|
@ -59,7 +59,7 @@ RUN set -x \
|
|||
&& for file in $(cat /lldap/app/static/fonts/fonts.txt); do wget -P app/static/fonts "$file"; done \
|
||||
&& chmod a+r -R .
|
||||
|
||||
FROM alpine:3.16
|
||||
FROM alpine:3.19
|
||||
WORKDIR /app
|
||||
ENV UID=1000
|
||||
ENV GID=1000
|
||||
|
@ -80,5 +80,6 @@ COPY --from=lldap --chown=$USER:$USER /lldap /app
|
|||
VOLUME ["/data"]
|
||||
HEALTHCHECK CMD ["/app/lldap", "healthcheck", "--config-file", "/data/lldap_config.toml"]
|
||||
WORKDIR /app
|
||||
COPY scripts/bootstrap.sh ./
|
||||
ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]
|
||||
CMD ["run", "--config-file", "/data/lldap_config.toml"]
|
||||
|
|
1
.github/workflows/Dockerfile.ci.debian-base
vendored
1
.github/workflows/Dockerfile.ci.debian-base
vendored
|
@ -74,6 +74,7 @@ COPY --from=lldap --chown=$USER:$USER /lldap /app
|
|||
COPY --from=lldap --chown=$USER:$USER /docker-entrypoint.sh /docker-entrypoint.sh
|
||||
VOLUME ["/data"]
|
||||
WORKDIR /app
|
||||
COPY scripts/bootstrap.sh ./
|
||||
ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]
|
||||
CMD ["run", "--config-file", "/data/lldap_config.toml"]
|
||||
HEALTHCHECK CMD ["/app/lldap", "healthcheck", "--config-file", "/data/lldap_config.toml"]
|
||||
|
|
|
@ -41,7 +41,7 @@ RUN cargo build --release -p lldap -p lldap_migration_tool -p lldap_set_password
|
|||
&& ./app/build.sh
|
||||
|
||||
# Final image
|
||||
FROM alpine:3.16
|
||||
FROM alpine:3.19
|
||||
|
||||
ENV GOSU_VERSION 1.14
|
||||
# Fetch gosu from git
|
||||
|
@ -80,6 +80,7 @@ COPY --from=builder /app/app/static app/static
|
|||
COPY --from=builder /app/app/pkg app/pkg
|
||||
COPY --from=builder /app/target/release/lldap /app/target/release/lldap_migration_tool /app/target/release/lldap_set_password ./
|
||||
COPY docker-entrypoint.sh lldap_config.docker_template.toml ./
|
||||
COPY scripts/bootstrap.sh ./
|
||||
|
||||
RUN set -x \
|
||||
&& apk add --no-cache bash tzdata \
|
||||
|
|
Loading…
Reference in a new issue