Docker/baseimage-docker
1
0
Fork 1
mirror of https://github.com/phusion/baseimage-docker.git synced 2026-03-26 04:18:46 +00:00
Code Issues Releases Wiki Activity

Merge pull request #203 from UnrealQuester/copy

Browse Source 
Use COPY instead of ADD
This commit is contained in:
Travis Rowland
2017-03-19 00:21:29 -07:00
committed by GitHub
parent 24b8bcebc8 17eadef537
commit 241c41e093
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -169,7 +169,7 @@ In `memcached.sh` (make sure this file is chmod +x):
In `Dockerfile`: In `Dockerfile`:
RUN mkdir /etc/service/memcached RUN mkdir /etc/service/memcached
ADD memcached.sh /etc/service/memcached/run COPY memcached.sh /etc/service/memcached/run
Note that the shell script must run the daemon **without letting it daemonize/fork it**. Usually, daemons provide a command line flag or a config file option for that. Note that the shell script must run the daemon **without letting it daemonize/fork it**. Usually, daemons provide a command line flag or a config file option for that.
@@ -193,7 +193,7 @@ In `logtime.sh` (make sure this file is chmod +x):
In `Dockerfile`: In `Dockerfile`:
RUN mkdir -p /etc/my_init.d RUN mkdir -p /etc/my_init.d
ADD logtime.sh /etc/my_init.d/logtime.sh COPY logtime.sh /etc/my_init.d/logtime.sh
<a name="environment_variables"></a> <a name="environment_variables"></a>
### Environment variables ### Environment variables
@@ -458,7 +458,7 @@ Instructions for logging in the container is the same as in section [Using the i
Edit your Dockerfile to install an SSH public key: Edit your Dockerfile to install an SSH public key:
## Install an SSH of your choice. ## Install an SSH of your choice.
ADD your_key.pub /tmp/your_key.pub COPY your_key.pub /tmp/your_key.pub
RUN cat /tmp/your_key.pub >> /root/.ssh/authorized_keys && rm -f /tmp/your_key.pub RUN cat /tmp/your_key.pub >> /root/.ssh/authorized_keys && rm -f /tmp/your_key.pub
Then rebuild your image. Once you have that, start a container based on that image: Then rebuild your image. Once you have that, start a container based on that image:

6
README_ZH_cn_.md
View File

@@ -155,7 +155,7 @@ Baseimage-docker *鼓励* 通过runit来运行多进程.
### 在Dockerfile中: ### 在Dockerfile中:
RUN mkdir /etc/service/memcached RUN mkdir /etc/service/memcached
ADD memcached.sh /etc/service/memcached/run COPY memcached.sh /etc/service/memcached/run
注意脚本必须运行在后台的,**不能让他们进程进行daemonize/fork**.通常,后台进程会提供一个标志位或者配置文件. 注意脚本必须运行在后台的,**不能让他们进程进行daemonize/fork**.通常,后台进程会提供一个标志位或者配置文件.
@@ -177,7 +177,7 @@ baseimage-docker的初始化脚本 `/sbin/my_init`,在启动的时候进程运
### 在 Dockerfile中: ### 在 Dockerfile中:
RUN mkdir -p /etc/my_init.d RUN mkdir -p /etc/my_init.d
ADD logtime.sh /etc/my_init.d/logtime.sh COPY logtime.sh /etc/my_init.d/logtime.sh
<a name="environment_variables"></a> <a name="environment_variables"></a>
@@ -486,7 +486,7 @@ Baseimage-docker提供了一个灵活的方式运行只要一闪而过的命令,
编辑你的dockerfile,来安装ssh public key: 编辑你的dockerfile,来安装ssh public key:
## 安装你自己的public key. ## 安装你自己的public key.
ADD your_key.pub /tmp/your_key.pub COPY your_key.pub /tmp/your_key.pub
RUN cat /tmp/your_key.pub >> /root/.ssh/authorized_keys && rm -f /tmp/your_key.pub RUN cat /tmp/your_key.pub >> /root/.ssh/authorized_keys && rm -f /tmp/your_key.pub
重新创建你的镜像.一旦你创建成功,启动基于这个镜像的容器. 重新创建你的镜像.一旦你创建成功,启动基于这个镜像的容器.

6
README_zh_tw.md
View File

@@ -156,7 +156,7 @@ The image is called `phusion/baseimage`, and is available on the Docker registry
### 在Dockerfile中: ### 在Dockerfile中:
RUN mkdir /etc/service/memcached RUN mkdir /etc/service/memcached
ADD memcached.sh /etc/service/memcached/run COPY memcached.sh /etc/service/memcached/run
注意腳本必須運行在後臺的,**不能讓他們行程進行daemonize/fork**.通常,後臺行程會提供一個標誌位或者配置文件. 注意腳本必須運行在後臺的,**不能讓他們行程進行daemonize/fork**.通常,後臺行程會提供一個標誌位或者配置文件.
@@ -178,7 +178,7 @@ baseimage-docker的初始化腳本 `/sbin/my_init`,在啓動的時候行程運
### 在 Dockerfile中: ### 在 Dockerfile中:
RUN mkdir -p /etc/my_init.d RUN mkdir -p /etc/my_init.d
ADD logtime.sh /etc/my_init.d/logtime.sh COPY logtime.sh /etc/my_init.d/logtime.sh
<a name="environment_variables"></a> <a name="environment_variables"></a>
@@ -487,7 +487,7 @@ Baseimage-docker提供了一個靈活的方式運行只要一閃而過的命令,
編輯你的dockerfile,來安裝ssh public key: 編輯你的dockerfile,來安裝ssh public key:
## 安裝你自己的public key. ## 安裝你自己的public key.
ADD your_key.pub /tmp/your_key.pub COPY your_key.pub /tmp/your_key.pub
RUN cat /tmp/your_key.pub >> /root/.ssh/authorized_keys && rm -f /tmp/your_key.pub RUN cat /tmp/your_key.pub >> /root/.ssh/authorized_keys && rm -f /tmp/your_key.pub
重新創建你的鏡像.一旦你創建成功,啓動基於這個鏡像的容器. 重新創建你的鏡像.一旦你創建成功,啓動基於這個鏡像的容器.

2
image/Dockerfile
View File

@@ -1,7 +1,7 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
MAINTAINER Phusion <info@phusion.nl> MAINTAINER Phusion <info@phusion.nl>
ADD . /bd_build COPY . /bd_build
RUN /bd_build/prepare.sh && \ RUN /bd_build/prepare.sh && \
/bd_build/system_services.sh && \ /bd_build/system_services.sh && \