Skip to content

Commit

Permalink
Add container env variable to import settings
Browse files Browse the repository at this point in the history
  • Loading branch information
iadgovuser29 committed Nov 6, 2024
1 parent 775ab4a commit 30810ba
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .ci/docker/Dockerfile.aca-rocky
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@ HEALTHCHECK --start-period=50s --interval=1s --timeout=90s CMD curl -f https://l
WORKDIR /hirs

# On container launch, the database will be set up. Then bootRun should utilize build artifacts stored in the image.
CMD ["bash", "-c", "/hirs/package/linux/aca/aca_setup.sh --unattended && /tmp/hirs_add_aca_tls_path_to_os.sh && /hirs/package/linux/aca/aca_bootRun.sh"]
CMD ["bash", "-c", "/hirs/package/linux/aca/aca_check_env.sh && /hirs/package/linux/aca/aca_setup.sh --unattended && /tmp/hirs_add_aca_tls_path_to_os.sh && /hirs/package/linux/aca/aca_bootRun.sh"]
18 changes: 18 additions & 0 deletions package/linux/aca/aca_check_env.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash

# Imported /etc/hirs should only be used if one doesn't exist
if [ ! -d "/etc/hirs" ]; then
if [ -n "${HIRS_USE_IMPORTED_ETC_HIRS}" ]; then
IMPORTED_ETC_HIRS_PATH="${HIRS_USE_IMPORTED_ETC_HIRS}"

if [ -d "$IMPORTED_ETC_HIRS_PATH" ]; then
cp -r "$IMPORTED_ETC_HIRS_PATH" /etc/hirs

find /etc/hirs -type d -exec chown root:root {} +
find /etc/hirs/certificates -type d -exec chown :mysql {} +
find /etc/hirs -type d -exec chmod -R g+rx {} +
find /etc/hirs -type f -exec chmod -R 644 {} +
chmod 755 /etc/hirs
fi
fi
fi

0 comments on commit 30810ba

Please sign in to comment.