docker

polaris1119 · polaris1119 · commit 372a2d31f097 · 2022-03-13T10:04:53.000+08:00
diff --git a/.dockerignore b/.dockerignore
@@ -10,3 +10,4 @@ assets
 *.o
 *.a
 *.so
+docker
diff --git a/.gitignore b/.gitignore
@@ -52,5 +52,6 @@ welcome.png
 ssl
 bin
 tmp
+docker
 
 *.code-workspace
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,10 @@
-# Start from golang v1.12 base image
-FROM golang:1.12
+# Start from golang v1.17 base image
+FROM golang:1.17
 
 WORKDIR /app/studygolang
 
-COPY . /app/studygolang
+COPY . /app/studygolang/
 
-RUN make build
+RUN make
 
-CMD ["bin/studygolang"]
+ENTRYPOINT ["bin/studygolang", "-embed_crawler", "-embed_indexing"]
diff --git a/config/db.sql b/config/db.sql
@@ -845,7 +845,7 @@ CREATE TABLE `interview_question` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
   `sn` bigint unsigned NOT NULL DEFAULT 0 COMMENT '题目序号，程序生成',
   `question` varchar(1022) NOT NULL DEFAULT '' COMMENT '问题',
-  `answer` varchar(4094) NOT NULL DEFAULT '' COMMENT '答案', 
+  `answer` text NOT NULL COMMENT '答案', 
   `level` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '问题难易级别：0-低；1-中；2-高',
   `viewnum` int unsigned NOT NULL DEFAULT 0 COMMENT '浏览数',
   `cmtnum` int unsigned NOT NULL DEFAULT 0 COMMENT '评论数',
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,13 +10,62 @@ services:
     networks:
       - default
       - app_net
+    depends_on:
+      - mysql
+      - redis
     external_links:
       - redis:redis
       - mysql:mysql
     volumes:
-      - ./static:/app/studygolang/static
-      - ./template:/app/studygolang/template
-      - ./log:/app/studygolang/log
+      - ./static:/data/www/studygolang/static
+      - ./template:/data/www/studygolang/template
+      - ./config:/data/www/studygolang/config
+      - ./log:/data/www/studygolang/log
+    restart: always
+  nginx:
+    container_name: nginx
+    build: ./nginx
+    depends_on:
+        - play
+    links:
+        - play:play
+    volumes:
+        - /data/www:/data/www:rw
+        - ./nginx/conf.d:/etc/nginx/conf.d:ro
+        - ./nginx/certs/:/etc/nginx/certs
+        - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+        - ./logs/nginx:/var/log/nginx:rw
+    ports:
+        - "80:80"
+        - "443:443"
+    restart: always
+    command: nginx -g 'daemon off;' 
+  mysql:
+      container_name: mysql
+      image: "mysql/mysql-server:5.7"
+      networks:
+          - default
+          - app_net
+      ports:
+          - "3306:3306"
+          - "33060:33060"
+      environment:
+          - MYSQL_ROOT_PASSWORD=123456
+      volumes:
+          - ./docker/mysql:/var/lib/mysql
+      restart: always
+  
+  redis:
+      container_name: redis
+      image: "redis:6.2"
+      networks:
+          - default
+          - app_net
+      ports:
+          - "6379:6379"
+      volumes:
+          - ./docker/redis:/usr/local/etc/redis
+      restart: always
 
 networks:
   app_net:
diff --git a/template/interview/question.html b/template/interview/question.html
@@ -102,6 +102,9 @@ <h3>答案解析：</h3>
     "/rank/view"
 ];
 
+var keyprefix = 'interview';
+var objid = {{.question.Id}};
+
 $(function(){
   loadComments();
 

-Original file line number
+Diff line change
 *.o
 *.a
 *.so
 +docker