- 优化 Dockerfile

- 添加 security_opt
- 日志 模式 -f

Author: netkiller

doc/docker/development/netkiller/Dockerfile

@@ -0,0 +1,6 @@
+FROM openjdk:latest
+VOLUME ["/opt/netkiller","/app"]
+RUN apt update -y && apt install -y procps
+EXPOSE 80 443
+WORKDIR /opt
+COPY index.html /var/www

doc/docker/service.md

@@ -143,4 +143,51 @@ version: '3.9'
 ------------------------------------------------------------
 {'services': {'netkiller': {'container_name': 'netkiller', 'build': {'context': '/Users/neo/GitHub/devops/doc/docker', 'dockerfile': './development/netkiller/Dockerfile'}, 'image': 'netkiller:1.3.0'}}, 'version': '3.9'}
 
+```
+
+## Context 上下文设置
+
+context 设置为 /srv/netkiller
+
+```python
+#!/usr/bin/python3
+#-*- coding: utf-8 -*-
+##############################################
+# Home	: https://www.netkiller.cn
+# Author: Neo <netkiller@msn.com>
+# Upgrade: 2025-07-24
+##############################################
+import os, sys
+
+module = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+sys.path.insert(0, module)
+from netkiller.docker import *
+
+target = 'init'
+
+dockerfile = Dockerfile("neo",'/srv/netkiller')
+dockerfile.image('openjdk:latest').volume(['/opt/netkiller','/app']).run('apt update -y && apt install -y procps').expose(['80','443']).workdir('/opt')
+dockerfile.copy('index.html','/var/www')
+
+neo = Services('netkiller')
+neo.build(dockerfile)
+neo.image("netkiller:1.3.0")
+
+development = Composes('development')
+development.version('3.9')
+development.services(neo)
+development.show()
+```
+
+输出结果 context: /srv/netkiller
+
+```text
+services:
+  netkiller:
+    container_name: netkiller
+    build:
+      context: /srv/netkiller
+      dockerfile: ./development/netkiller/Dockerfile
+    image: netkiller:1.3.0
+version: '3.9'
 ```

doc/docker/service.py

@@ -13,23 +13,24 @@
 
 target = 'init'
 
-dockerfile = Dockerfile("neo",None,target)
-dockerfile.image('nginx:latest',target).volume(['/etc/nginx','/var/log/nginx']).run('apt update -y && apt install -y procps').expose(['80','443']).workdir('/opt')
-dockerfile.copy('index.html','/var/www',target)
-dockerfile.show()
-print('-'*60)
+dockerfile = Dockerfile("neo",'/srv/netkiller')
+dockerfile.image('openjdk:latest').volume(['/opt/netkiller','/app']).run('apt update -y && apt install -y procps').expose(['80','443']).workdir('/opt')
+dockerfile.copy('index.html','/var/www')
+# dockerfile.show()
+# print('-'*60)
 
 neo = Services('netkiller')
 neo.build(dockerfile)
 neo.image("netkiller:1.3.0")
-neo.show()
-print('-'*60)
+# neo.show()
+# print('-'*60)
 
 development = Composes('development')
 development.version('3.9')
 development.services(neo)
 development.show()
+# development.workdir("/tmp/test")
 
-print('-'*60)
+# print('-'*60)
+development.save('/tmp/neo.yaml')
 development.debug()
-# development.save('/tmp/neo.yaml')

netkiller/docker.py

@@ -479,13 +479,12 @@ def services(self, obj):
         if isinstance(obj, Services):
             if obj.dockerfile:
                 self.dockerfile[obj.name] = obj.dockerfile
-                filepath = f"{self.basedir}/{self.name}/{obj.name}/Dockerfile"
                 build = {}
                 if obj.dockerfile.context:
                     build["context"] = obj.dockerfile.context
                 else:
                     build["context"] = os.getcwd()
-                build["dockerfile"] = filepath
+                build["dockerfile"] = f"{obj.dockerfile.context}/Dockerfile"
                 obj.build(build)
             service = copy.deepcopy(obj.service)
             self.compose["services"].update(service)
@@ -521,6 +520,11 @@ def show(self):
 
     def filename(self):
         return self.basedir + "/" + self.name + "/" + "compose.yaml"
+    def mkdirs(self, filepath):
+        dirname = os.path.dirname(filepath)
+        if not os.path.isdir(dirname):
+            os.makedirs(dirname)
+            self.logger.info("Create directory %s" % (dirname))
 
     def save(self, filename=None):
 
@@ -540,16 +544,15 @@ def save(self, filename=None):
         if not filename:
             filename = self.filename()
 
-        dirname = os.path.dirname(filename)
-        if not os.path.isdir(dirname):
-            os.makedirs(dirname)
-            self.logger.info("Create directory %s" % (dirname))
+        self.mkdirs(filename)
 
         try:
             for service, dockerfile in self.dockerfile.items():
-                filepath = self.compose['services'][service]['build']['dockerfile']
-                print(filepath)
+                filepath = f"{self.basedir}/{self.name}/{service}/Dockerfile"
+                # filepath = self.compose['services'][service]['build']['dockerfile']
+                self.mkdirs(filepath)
                 dockerfile.save(filepath)
+                self.compose['services'][service]['build']['dockerfile']=filepath
                 # self.logger.debug("Dockerfile")
 
             file = open(filename, "w")
@@ -965,7 +968,6 @@ def dump(self):
         if self.options.environment and self.options.environment in self.composes:
             compose = self.composes[self.options.environment]
             compose.dump()
-            # if compose:
         else:
             for env, compose in self.composes.items():
                 print(f"---------- {env} ----------")