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

[BV-195] Avoid /root as home folder #65

Merged
merged 2 commits into from
Sep 9, 2024
Merged

[BV-195] Avoid /root as home folder #65

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
9c99655
using /home/leverage rather than /root
Franr Sep 8, 2024
5870f59
bump version with breaking changes
Franr Sep 8, 2024
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
13 changes: 5 additions & 8 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,19 +171,16 @@ RUN ["/bin/bash", "-c", ". .machinetype.env && \
# Install Scripts
################################

RUN mkdir -p /root/scripts/aws-mfa
COPY ./scripts/aws-mfa/aws-mfa-entrypoint.sh /root/scripts/aws-mfa/aws-mfa-entrypoint.sh
RUN mkdir -p /root/scripts/aws-sso
COPY ./scripts/aws-sso/aws-sso-configure.sh /root/scripts/aws-sso/aws-sso-configure.sh
COPY ./scripts/aws-sso/aws-sso-login.sh /root/scripts/aws-sso/aws-sso-login.sh
COPY ./scripts/aws-sso/aws-sso-logout.sh /root/scripts/aws-sso/aws-sso-logout.sh
COPY ./scripts/aws-sso/aws-sso-entrypoint.sh /root/scripts/aws-sso/aws-sso-entrypoint.sh
RUN mkdir -p /home/leverage
COPY ./scripts/aws-mfa/aws-mfa-entrypoint.sh /home/leverage/scripts/aws-mfa/aws-mfa-entrypoint.sh
COPY ./scripts/aws-sso/aws-sso-login.sh /home/leverage/scripts/aws-sso/aws-sso-login.sh
COPY ./scripts/aws-sso/aws-sso-logout.sh /home/leverage/scripts/aws-sso/aws-sso-logout.sh

################################
# Install
################################

RUN chmod -R +x /root/scripts/
RUN chmod -R +x /home/leverage/scripts/

################################
# Install
Expand Down
77 changes: 0 additions & 77 deletions scripts/aws-sso/aws-sso-configure.sh
View file
Open in desktop

This file was deleted.

148 changes: 0 additions & 148 deletions scripts/aws-sso/aws-sso-entrypoint.sh
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions scripts/aws-sso/aws-sso-login.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ function log {
SCRIPT_LOG_LEVEL=${SCRIPT_LOG_LEVEL:-2}
PROJECT=$(hcledit -f "$COMMON_CONFIG_FILE" attribute get project | sed 's/"//g')
SSO_PROFILE_NAME=${SSO_PROFILE_NAME:-$PROJECT-sso}
SSO_CACHE_DIR=${SSO_CACHE_DIR:-/root/tmp/$PROJECT/sso/cache}
AWS_SSO_CACHE_DIR=/root/.aws/sso/cache
SSO_CACHE_DIR=${SSO_CACHE_DIR:-/home/leverage/tmp/$PROJECT/sso/cache}
AWS_SSO_CACHE_DIR=/home/leverage/.aws/sso/cache
SSO_TOKEN_FILE_NAME='token'
debug "SCRIPT_LOG_LEVEL=$SCRIPT_LOG_LEVEL"
debug "COMMON_CONFIG_FILE=$COMMON_CONFIG_FILE"
Expand Down
2 changes: 1 addition & 1 deletion scripts/aws-sso/aws-sso-logout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function log {
# -----------------------------------------------------------------------------
SCRIPT_LOG_LEVEL=${SCRIPT_LOG_LEVEL:-2}
PROJECT=$(hcledit -f "$COMMON_CONFIG_FILE" attribute get project | sed 's/"//g')
SSO_CACHE_DIR=${SSO_CACHE_DIR:-/root/tmp/$PROJECT/sso/cache}
SSO_CACHE_DIR=${SSO_CACHE_DIR:-/home/leverage/tmp/$PROJECT/sso/cache}
debug "SCRIPT_LOG_LEVEL=$SCRIPT_LOG_LEVEL"
debug "AWS_SHARED_CREDENTIALS_FILE=$AWS_SHARED_CREDENTIALS_FILE"
debug "AWS_CONFIG_FILE=$AWS_CONFIG_FILE"
Expand Down
6 changes: 3 additions & 3 deletions versions_to_build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
1.3.5-0.1.18
1.5.0-0.1.18
1.6.0-0.1.18
1.3.5-0.2.0
1.5.0-0.2.0
1.6.0-0.2.0
Loading