Skip to content

Commit

Permalink
fixing Makefile and .gitignore files
Browse files Browse the repository at this point in the history
  • Loading branch information
opeoniye committed Sep 16, 2023
1 parent ce75fe4 commit dedb933
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 27 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ setup
ops/.env.dev
ops/.env.prod
src/.env
src/docker-compose.yml

# folders
_
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ SHELL := /bin/bash
SRC := $(shell os=$$(uname -s); \
if [ "$$os" = "Linux" ]; then \
cp ./ops/.env.prod ./src/.env; \
cp ./docker-prod.yml ./src/docker-compose.yml; \
elif [ "$$os" = "Darwin" ]; then \
cp ./ops/.env.dev ./src/.env; \
cp ./docker-dev.yml ./src/docker-compose.yml; \
else \
exit 1; \
fi)
Expand Down Expand Up @@ -79,7 +81,6 @@ up:
@if [ "$$(uname -s)" = "Linux" ]; then \
if [ -f ops/.env.prod ]; then \
echo -e "\033[31mStarting container in prod environment...\033[0m"; \
cp $(EP) $(ENF) 2>/dev/null || :; \
docker pull $(DIN):$(DIV); \
docker compose -f $(DCF) --env-file $(EF) up -d; \
else \
Expand All @@ -89,7 +90,6 @@ up:
elif [ "$$(uname -s)" = "Darwin" ]; then \
if [ -f ops/.env.prod ]; then \
echo -e "\033[31mStarting container in dev environment...\033[0m"; \
cp $(ED) $(ENF) 2>/dev/null || :; \
docker compose -f $(DCF) --env-file $(EF) up -d; \
else \
echo -e "\033[31menv file for dev missing.\033[0m"; \
Expand Down
25 changes: 0 additions & 25 deletions src/docker-compose.yml

This file was deleted.

0 comments on commit dedb933

Please sign in to comment.