Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Include bootstrap.sh in main image #885

Merged
merged 5 commits into from
Apr 1, 2024
Merged

Include bootstrap.sh in main image #885

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
735d0e7
Include bootstrap.sh in main image
djjudas21 Mar 28, 2024
cdf4dc1
Include bootstrap.sh in images
djjudas21 Mar 28, 2024
a3969e7
Update to Alpine 3.19
djjudas21 Mar 28, 2024
d590a1e
Place bootstrap.sh in /app
djjudas21 Mar 28, 2024
f7689bb
Move bootstrap.sh to /scripts
djjudas21 Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/Dockerfile.ci.alpine-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ RUN apk add --no-cache tini ca-certificates bash tzdata && \
mkdir -p /data && \
chown $USER:$USER /data
COPY --from=lldap --chown=$USER:$USER /lldap /app
COPY example_configs/bootstrap/bootstrap.sh ./
VOLUME ["/data"]
HEALTHCHECK CMD ["/app/lldap", "healthcheck", "--config-file", "/data/lldap_config.toml"]
WORKDIR /app
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/Dockerfile.ci.debian-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ RUN apt update && \
mkdir -p /data && chown $USER:$USER /data
COPY --from=lldap --chown=$USER:$USER /lldap /app
COPY --from=lldap --chown=$USER:$USER /docker-entrypoint.sh /docker-entrypoint.sh
COPY example_configs/bootstrap/bootstrap.sh ./
VOLUME ["/data"]
WORKDIR /app
ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
djjudas21 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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 example_configs/bootstrap/bootstrap.sh ./
djjudas21 marked this conversation as resolved.
Show resolved Hide resolved

RUN set -x \
&& apk add --no-cache bash tzdata \
Expand Down