浏览代码

corrections

Francesco 1 年之前
父节点
当前提交
ecb7249cd8
共有 2 个文件被更改,包括 9 次插入4 次删除
  1. 3 2
      readme.md
  2. 6 2
      site2/Dockerfile

+ 3 - 2
readme.md

@@ -56,7 +56,8 @@ PYTHON:
 
 
 DOCKER:
-- docker exec -it tigro000 bash  -->  explore Docker image 'tigro000' filesystem (with bash); more generally, docker exec will execute commands on it.
+- docker exec -it tigro000 bash  -->  explore filesystem Docker of *container* named 'tigro000' (with bash); more generally, docker exec will execute commands on it. The container has to be running.
 - docker run -d --name tigro -p 80:80 tigro000  -->  example of running Docker: run image 'tigro000' in container named 'tigro'; expose internal port 80 on external port 80 (-p); detach (-d)
 - docker images  -->  check existing Docker images
-- docker ps  -->  check running docker containers
+- docker ps  -->  check running docker containers
+- docker rm IMAGE/CONTAINER  -->  delete selected image or container

+ 6 - 2
site2/Dockerfile

@@ -1,6 +1,10 @@
 FROM httpd:latest
-COPY * /usr/local/apache2/htdocs/tigro_website/
+COPY . /usr/local/apache2/htdocs/tigro_website/
 COPY js/toExport_alt.js /usr/local/apache2/htdocs/tigro_website/js/toExport.js
 COPY tigro.conf /etc/apache2/sites-available/
-CMD ["a2ensite", "tigro"]
+
+# This doesn't work, 'a2ensite' doesn't exist
+#CMD ["a2ensite", "tigro"]
+#
+
 EXPOSE 80