Skip to content

Intergrate conf snippets in include_sections from migrid PR244. #105

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

Closed
wants to merge 2 commits into from
Closed

Intergrate conf snippets in include_sections from migrid PR244. #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5af5f2c
Reuse the strategy from external-certificates folder for the new MiGs…
jonasbardino May 26, 2025
8a7f201
Make sure dest dir exists and copy to absolute location.
jonasbardino May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Dockerfile.centos7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1408,6 +1408,10 @@ RUN if [ -n "${TRAC_ADMIN_PATH}" -a -z "${TRAC_INI_PATH}" ]; then \
fi; \
fi;

# Copy in any external conf sections to supplement generated MiGserver.conf
RUN mkdir -p $MIG_ROOT/mig/server/MiGserver.d
COPY external-conf-sections/ $MIG_ROOT/mig/server/MiGserver.d/


#------------------------- next stage -----------------------------#
FROM --platform=linux/$ARCH install_mig AS setup_mig_configs
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile.rocky8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1426,6 +1426,10 @@ RUN if [ -n "${TRAC_ADMIN_PATH}" -a -z "${TRAC_INI_PATH}" ]; then \
fi; \
fi;

# Copy in any external conf sections to supplement generated MiGserver.conf
RUN mkdir -p $MIG_ROOT/mig/server/MiGserver.d
COPY external-conf-sections/ $MIG_ROOT/mig/server/MiGserver.d/


#------------------------- next stage -----------------------------#
FROM --platform=linux/$ARCH install_mig AS setup_mig_configs
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile.rocky9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,6 +1302,10 @@ RUN if [ -n "${TRAC_ADMIN_PATH}" -a -z "${TRAC_INI_PATH}" ]; then \
fi; \
fi;

# Copy in any external conf sections to supplement generated MiGserver.conf
RUN mkdir -p $MIG_ROOT/mig/server/MiGserver.d
COPY external-conf-sections/ $MIG_ROOT/mig/server/MiGserver.d/


#------------------------- next stage -----------------------------#
FROM --platform=linux/$ARCH install_mig AS setup_mig_configs
Expand Down
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ initdirs: initcomposevars
mkdir -p certs
mkdir -p httpd
mkdir -p mig
mkdir -p external-conf-sections
mkdir -p state
mkdir -p ${VOLATILE_ROOT}/mig_system_run
mkdir -p ${VOLATILE_ROOT}/openid_store
Expand Down Expand Up @@ -254,6 +255,7 @@ distclean: clean sitestateclean sitedataclean dockerclean dockervolumeclean
rm -fr ./external-certificates
# NOTE: certs remove in clean is conditional - always remove it here
rm -fr ./certs
rm -fr ./external-conf-sections
rm -f .env docker-compose.yml Dockerfile

wipesitestatewarning:
Expand Down