fix docker

.dockerignore

@@ -1,18 +1,34 @@
-.git
-.gitignore
-Dockerfile
-.dockerignore
-*.md
-
-set_mark/__pycache__
-/__pycache__
+__pycache__
 /app_session
+
+data/set.json
+data/mysql.json
+data/oauthsettings.json
+data/version.json
+
+route/tool/set_mark/custom.py
+
+images
+
 .vscode
+goorm.manifest
+.DS_Store
 
 *.db
+*.db-shm
+*.db-wal
+*.db-journal
+
+robots.txt
+custom.py
+404.html
 
 views/liberty
-views/yousoro
-views/super_lite
 views/buma
 views/before_namu
+views/acme
+views/sl_open
+views/nitori
+
+sitemap.xml
+sitemap_0.xml

.gitignore

@@ -9,7 +9,10 @@ data/version.json
 route/tool/set_mark/custom.py
 
 images
+
 .vscode
+goorm.manifest
+.DS_Store
 
 *.db
 *.db-shm
@@ -20,8 +23,6 @@ robots.txt
 custom.py
 404.html
 
-goorm.manifest
-
 views/liberty
 views/buma
 views/before_namu
@@ -29,6 +30,5 @@ views/acme
 views/sl_open
 views/nitori
 
-.DS_Store
 sitemap.xml
-sitemap_0.xml
+sitemap_0.xml

Docker-Install.md

@@ -1,10 +1,10 @@
 ## Installation
 ```
-docker pull opennamu/stable
+docker pull opennamu/opennamu
 ```
 
 ## Start
 ```
-docker run -p 3000:3000 -v data:/app/data --name opennamu opennamu/stable
-docker run -p <host-port>:3000 -v <host-data_directory>:/app/data --name <docker-containername> opennamu/stable
+docker run -p 3000:3000 -v data:/app/data --name opennamu opennamu/opennamu
+docker run -p <host-port>:3000 -v <host-data_directory>:/app/data --name <docker-containername> opennamu/opennamu
 ```

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6.8-stretch
+FROM python:3.10.5-alpine
 
 MAINTAINER 2du <min08101@naver.com>
 MAINTAINER hoparkgo9ma <me@ho9.me>
@@ -10,6 +10,7 @@ ENV NAMU_PORT 3000
 ENV NAMU_LANG en-US
 ENV NAMU_MARKUP namumark
 ENV NAMU_ENCRYPT sha3
+ENV NAMU_DOCKER O
 
 ADD . /app
 WORKDIR /app

Dockerfile.arm64v8

@@ -1,4 +1,4 @@
-FROM arm64v8/python:3.6.8-stretch
+FROM arm64v8/3.10.5-alpine
 
 MAINTAINER 2du <min08101@naver.com>
 MAINTAINER hoparkgo9ma <me@ho9.me>
@@ -10,6 +10,7 @@ ENV NAMU_PORT 3000
 ENV NAMU_LANG en-US
 ENV NAMU_MARKUP namumark
 ENV NAMU_ENCRYPT sha3
+ENV NAMU_DOCKER O
 
 ADD . /app
 WORKDIR /app

Dockerfile.arm64v8.ko

@@ -0,0 +1,21 @@
+FROM arm64v8/3.10.5-alpine
+
+MAINTAINER 2du <min08101@naver.com>
+MAINTAINER hoparkgo9ma <me@ho9.me>
+
+ENV NAMU_DB_TYPE sqlite
+ENV NAMU_DB data
+ENV NAMU_HOST 0.0.0.0
+ENV NAMU_PORT 3000
+ENV NAMU_LANG ko-KR
+ENV NAMU_MARKUP namumark
+ENV NAMU_ENCRYPT sha3
+ENV NAMU_DOCKER O
+
+ADD . /app
+WORKDIR /app
+
+RUN pip install -r requirements.txt
+EXPOSE 3000
+
+CMD [ "python", "./app.py" ]

Dockerfile.ko

@@ -0,0 +1,21 @@
+FROM python:3.10.5-alpine
+
+MAINTAINER 2du <min08101@naver.com>
+MAINTAINER hoparkgo9ma <me@ho9.me>
+
+ENV NAMU_DB_TYPE sqlite
+ENV NAMU_DB data
+ENV NAMU_HOST 0.0.0.0
+ENV NAMU_PORT 3000
+ENV NAMU_LANG ko-KR
+ENV NAMU_MARKUP namumark
+ENV NAMU_ENCRYPT sha3
+ENV NAMU_DOCKER O
+
+ADD . /app
+WORKDIR /app
+
+RUN pip install -r requirements.txt
+EXPOSE 3000
+
+CMD [ "python", "./app.py" ]

app.py

@@ -191,6 +191,8 @@ with get_db_connect() as conn:
             server_set_val = server_set_val[0][0]
         elif server_set_env[i] != None:
             server_set_val = server_set_env[i]
+
+            curs.execute(db_change('insert into other (name, data) values (?, ?)'), [i, server_set_env[i]])
         else:
             if 'list' in server_set_var[i]:
                 print(server_set_var[i]['display'] + ' (' + server_set_var[i]['default'] + ') [' + ', '.join(server_set_var[i]['list']) + ']' + ' : ', end = '')