File locations has been rearranged (Close #1)

nobrin · Feb 14, 2017 · c3750a8 · c3750a8
1 parent b7ee048
commit c3750a8
Show file tree

Hide file tree

Showing 20 changed files with 28 additions and 15 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,5 +1,11 @@
 Dockerfile
-code
+.dockerignore
+.git/
+!.git/HEAD
+!.git/refs
+.gitignore
+pkgs/
+code/
 lib/bottle.py
 */*.pyc
 README.md

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+code/
+pkgs/
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

diff --git a/Dockerfile b/Dockerfile
@@ -3,18 +3,19 @@ MAINTAINER Nobuo OKAZAKI
 RUN apk add --no-cache python2 py2-bottle bash \
  && adduser -u 1000 -D bottle bottle \
  && rm -rf /tmp/* /media /mnt /run /srv
-ADD ./ /opt/regiui/
-ADD .git/HEAD /tmp/.git/
-ADD .git/refs /tmp/.git/refs
-RUN GITREF=$(cat /tmp/.git/HEAD | cut -d" " -f2) \
- && GITSHA1=$(cat /tmp/.git/$GITREF) \
+ENV INSTALL_PREFIX /opt/regiui
+COPY ./ $INSTALL_PREFIX
+RUN set -x \
+ && GITREF=$(cat $INSTALL_PREFIX/.git/HEAD | cut -d" " -f2) \
+ && GITSHA1=$(cat $INSTALL_PREFIX/.git/$GITREF) \
  && GITBR=$(echo refs/heads/master | cut -d/ -f3) \
- && echo "{\"git\":{\"sha1\":\"$GITSHA1\",\"branch\":\"$GITBR\"}}" > /opt/regiui/public/version.json \
+ && echo "{\"git\":{\"sha1\":\"$GITSHA1\",\"branch\":\"$GITBR\"}}" > $INSTALL_PREFIX/share/regiui/static/version.json \
+ && rm -rf $INSTALL_PREFIX/.git \
  && rm -rf /tmp/* /media /mnt /run /srv
-ENV PYTHONPATH /opt/regiui/lib:$PYTHONPATH
+ENV PYTHONPATH $INSTALL_PREFIX/lib
 USER bottle
 ENTRYPOINT ["bottle.py", \
   "-b", "0.0.0.0:8000", \
-  "regiui" \
+  "regiui.app" \
 ]
 EXPOSE 8000
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ RegiUI requires python 2.7 and [bottle.py](https://bottlepy.org). You have to in
 ```
 $ sudo yum -y install python2-bottle
 $ export PYTHONPATH=<path to lib of RegiUI>:$PYTHONPATH
-$ python /usr/lib/python2.7/site-packages/bottle.py regiui
+$ python /usr/lib/python2.7/site-packages/bottle.py regiui.app
 Bottle v0.12.9 server starting up (using WSGIRefServer())...
 Listening on http://localhost:8080/
 Hit Ctrl-C to quit.

diff --git a/lib/docker_registry.py → lib/regiui/__init__.py b/lib/docker_registry.py → lib/regiui/__init__.py
diff --git a/lib/regiui.py → lib/regiui/app.py b/lib/regiui.py → lib/regiui/app.py
@@ -1,13 +1,16 @@
 # -*- coding: utf-8 -*-
 # Project:
 # Module:
-import sys, os
+import sys, os, re
 import bottle
 from bottle import route, static_file, redirect, request, HTTPError
-from docker_registry import Registry
+from . import Registry
 
-bottle.TEMPLATE_PATH = [os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "templates"))]
-STATIC_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "public"))
+LIB_PATH = re.sub(r"/python%d\.%d/site-packages/regiui$", "/regiui", os.path.abspath(os.path.dirname(__file__)))
+SHARE_PATH = os.path.abspath(os.path.join(LIB_PATH, "..", "..", "share", "regiui"))
+STATIC_PATH = os.path.join(SHARE_PATH, "static")
+bottle.TEMPLATE_PATH = [os.path.join(SHARE_PATH, "views")]
+print SHARE_PATH
 
 PREFIX = os.environ.get("URL_PREFIX", "/").rstrip("/") + "/"
 REGISTRY = os.environ.get("REGISTRY", "http://localhost:5000")

diff --git a/public/bootstrap.min.css → share/regiui/static/bootstrap.min.css b/public/bootstrap.min.css → share/regiui/static/bootstrap.min.css
diff --git a/public/bootstrap.min.js → share/regiui/static/bootstrap.min.js b/public/bootstrap.min.js → share/regiui/static/bootstrap.min.js
diff --git a/public/html5shiv.min.js → share/regiui/static/html5shiv.min.js b/public/html5shiv.min.js → share/regiui/static/html5shiv.min.js
diff --git a/public/jquery.min.js → share/regiui/static/jquery.min.js b/public/jquery.min.js → share/regiui/static/jquery.min.js
diff --git a/public/octicons-p.css → share/regiui/static/octicons-p.css b/public/octicons-p.css → share/regiui/static/octicons-p.css
diff --git a/public/octicons-p.ttf → share/regiui/static/octicons-p.ttf b/public/octicons-p.ttf → share/regiui/static/octicons-p.ttf
diff --git a/public/octicons-p.woff → share/regiui/static/octicons-p.woff b/public/octicons-p.woff → share/regiui/static/octicons-p.woff
diff --git a/public/regiui.css → share/regiui/static/regiui.css b/public/regiui.css → share/regiui/static/regiui.css
diff --git a/public/respond.min.js → share/regiui/static/respond.min.js b/public/respond.min.js → share/regiui/static/respond.min.js
diff --git a/public/version.json → share/regiui/static/version.json b/public/version.json → share/regiui/static/version.json
diff --git a/templates/frame.html → share/regiui/views/frame.html b/templates/frame.html → share/regiui/views/frame.html
diff --git a/templates/index.html → share/regiui/views/index.html b/templates/index.html → share/regiui/views/index.html
diff --git a/templates/repo-info.html → share/regiui/views/repo-info.html b/templates/repo-info.html → share/regiui/views/repo-info.html
diff --git a/templates/repo-taginfo.html → share/regiui/views/repo-taginfo.html b/templates/repo-taginfo.html → share/regiui/views/repo-taginfo.html
@@ -59,7 +59,7 @@ <h4 class="modal-title">Are you sure?</h4>
           <div class="modal-body">
             <p class="text-danger"><strong>This function is EXPERIMENTAL and DANGEROUS. Do your own risk!!</strong></p>
             <p>This action CANNOT be undone. This will permanently delete the <b>{{ reponame }}:{{ info["name"] }}</b> tag from {{ reponame }} repository.</p>
-            <p>Please type in the name of the tag to confirm.</p>
+            <p>Please type in the name of the tag '<b>{{ info["name"] }}</b>' to confirm.</p>
             <input type="text" class="form-control" id="txtDelete">
           </div>
           <div class="modal-footer">