Commit 3f105013 authored by Daniel Edgecumbe's avatar Daniel Edgecumbe

.gitignore cleanups; fix run.sh

parent 49dd6bef
Pipeline #286 passed with stages
in 27 seconds
*.swp
*.bak
*.rs.bk
docker-compose.yml
_git_status
nginx/_git_status
nginx/public_html/vue.js
nginx/public_html/_git_status
nginx/public_html/_git_status.txt
nginx/public_html/AUTHORS.md
nginx/public_html/AUTHORS.md.txt
backend/target
*.swp
target
*.rs.bk
*.swp
*.pem
*.log
*.conf
frontend/chartist-plugin-tooltip
*.db
_git_status
AUTHORS.md
......@@ -20,7 +20,3 @@ FROM nginx:latest
COPY nginx-config/default /etc/nginx/conf.d/default.conf
COPY public_html /usr/share/nginx/html
COPY _git_status /usr/share/nginx/html/_git_status
COPY _git_status /usr/share/nginx/html/_git_status.txt
COPY AUTHORS.md /usr/share/nginx/html/AUTHORS.md
COPY AUTHORS.md /usr/share/nginx/html/AUTHORS.md.txt
......@@ -22,16 +22,23 @@
>&2 echo "Generating _git_status..."
echo "bitcoin-top" > nginx/_git_status
git rev-parse HEAD >> nginx/_git_status
git log -1 --oneline HEAD >> nginx/_git_status
git status --porcelain >> nginx/_git_status
cp AUTHORS.md nginx/AUTHORS.md
echo "bitcoin-top" > nginx/public_html/_git_status
git rev-parse HEAD >> nginx/public_html/_git_status
git log -1 --oneline HEAD >> nginx/public_html/_git_status
git status --porcelain >> nginx/public_html/_git_status
cp nginx/public_html/_git_status nginx/public_html/_git_status.txt
cp AUTHORS.md nginx/public_html/AUTHORS.md
cp AUTHORS.md nginx/public_html/AUTHORS.md.txt
# If the build step fails, try uncommenting this:
NOCACHE=
#NOCACHE=--no-cache
sudo docker-compose build $NOCACHE
sudo docker-compose build $NOCACHE $@
rm nginx/public_html/_git_status
rm nginx/public_html/_git_status.txt
rm nginx/public_html/AUTHORS.md
rm nginx/public_html/AUTHORS.md.txt
>&2 echo "Running..."
sudo docker-compose up -d --remove-orphans && sudo docker-compose logs -f --tail="10"
*.swp
*.pem
*.log
*.conf
*.db
_git_status
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment