Skip to content

Commit beba236

Browse files
author
Michele Mondelli
committed
feat: add support for memento docker plugin
1 parent 08c5858 commit beba236

3 files changed

Lines changed: 14 additions & 38 deletions

File tree

.bmeme/build/commands/create.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@ if [[ "$1" == "run" ]]; then
1919
docker-compose build --build-arg FIX_UID=$(id -u) --build-arg FIX_GID=$(id -g) 2>&1 >> ${LOGFILE}
2020
echo "${LOGPREFIX} CMD docker-compose up -d" >> ${LOGFILE}
2121
docker-compose up -d 2>&1 >> ${LOGFILE}
22-
2322
echo ""
24-
if [[ ":$PATH:" == *":$LOCAL_PATH:"* ]]; then
25-
echo -e "Your ${CG}\$PATH${CN} is correctly set"
26-
else
27-
echo -e "Your ${CG}\$PATH${CN} is not configured."
28-
echo ""
29-
echo -e "Run: ${CY}eval \$(${0} env)${CN}"
30-
echo ""
31-
fi
3223

3324
fi

configure renamed to .bmeme/build/configure

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#!/usr/bin/env bash
22

33
set -e
4-
source .bmeme/build/common/lib.sh
4+
THIS_SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
5+
source "${THIS_SCRIPT_DIR}/common/lib.sh"
56

67
mkdir -p "${BASE_PRJ_DIR}/.bmeme/log"
78

8-
if ! test -f ".env"; then
9+
if ! test -f "${BASE_PRJ_DIR}/.env"; then
910
echo "Please specify the vendor for your new project."
1011
echo "Typically this is your organization name, or the organization the projects belongs to."
1112
echo -n -e "${CY}Vendor:${CN} "
@@ -18,24 +19,18 @@ if ! test -f ".env"; then
1819

1920
echo ""
2021
echo -e "Configuring ${CG}env${CN} file..."
21-
sed "s/@@@PROJECT@@@/${PROJECT}/g;s/@@@VENDOR@@@/${VENDOR}/g" .env.dist >.env
22+
sed "s/@@@PROJECT@@@/${PROJECT}/g;s/@@@VENDOR@@@/${VENDOR}/g" "${BASE_PRJ_DIR}/.env.dist" > "${BASE_PRJ_DIR}/.env"
2223

2324
echo -e "Removing ${CG}.env.dist${CN} file..."
24-
rm -f .env.dist
25+
rm -f "${BASE_PRJ_DIR}/.env.dist"
2526

26-
source .env
27+
source "${BASE_PRJ_DIR}/.env"
2728
fi
2829

29-
if ! test -f ".env"; then
30+
if ! test -f "${BASE_PRJ_DIR}/.env"; then
3031
exit 1
3132
fi
3233

33-
command_env() {
34-
if [[ ":$PATH:" != *":$LOCAL_PATH:"* ]]; then
35-
echo -n "export PATH=\"${LOCAL_PATH}:\${PATH}\""
36-
fi
37-
}
38-
3934
command_help() {
4035

4136
echo ""
@@ -44,23 +39,15 @@ command_help() {
4439
echo "=============================================================================================="
4540
echo ""
4641
echo -en "${CY}"
47-
printf "%-25s" "${0} help"
42+
printf "%-25s" " help"
4843
echo -e "${CN} -- Show help on how to use this script"
49-
for i in $(ls .bmeme/build/commands); do
50-
CMD_DESCR=$(.bmeme/build/commands/$i descr)
44+
for i in $(ls "${BASE_PRJ_DIR}/.bmeme/build/commands"); do
45+
CMD_DESCR=$("${BASE_PRJ_DIR}/.bmeme/build/commands/$i" descr)
5146
echo -en "${CY}"
52-
printf "%-25s" "${0} ${i%.*}"
47+
printf "%-25s" " ${i%.*}"
5348
echo -e "${CN} -- ${CMD_DESCR}"
5449
done
5550
echo -en "${CY}"
56-
printf "%-25s" "eval \$(${0} env)"
57-
echo -e "${CN} -- Set your \$PATH in order to use c script wrapper"
58-
echo ""
59-
60-
if [[ ":$PATH:" == *":$LOCAL_PATH:"* ]]; then
61-
echo ""
62-
echo -e "Your ${CG}\$PATH${CN} is correctly set"
63-
fi
6451

6552
echo ""
6653
echo -e "DNS alias: ${CB}app.${PROJECT_NAME}.${PROJECT_VENDOR}.docker${CN}"
@@ -78,10 +65,8 @@ for cmdLineArg in "$@"; do
7865

7966
if [[ "$cmdLineArg" == "help" ]]; then
8067
command_help
81-
elif [[ "$cmdLineArg" == "env" ]]; then
82-
command_env
83-
elif [[ -f ".bmeme/build/commands/${cmdLineArg}.sh" ]]; then
84-
bash -c ".bmeme/build/commands/${cmdLineArg}.sh run"
68+
elif [[ -f "${BASE_PRJ_DIR}/.bmeme/build/commands/${cmdLineArg}.sh" ]]; then
69+
bash -c "${BASE_PRJ_DIR}/.bmeme/build/commands/${cmdLineArg}.sh run"
8570
else
8671
echo -e "Unrecognized command: ${CR}${cmdLineArg}${CN}"
8772
echo

.bmeme/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ services:
1111
environment:
1212
- TERM=xterm-256color
1313
- DNSDOCK_ALIAS=app.${PROJECT_NAME}.${PROJECT_VENDOR}.docker
14-
- VIRTUAL_PORT=8090
14+
- VIRTUAL_PORT=8080
1515
- VIRTUAL_HOST=app.${PROJECT_NAME}.${PROJECT_VENDOR}.docker

0 commit comments

Comments
 (0)