1
0
mirror of https://github.com/phusion/baseimage-docker.git synced 2026-03-26 12:29:07 +00:00

Compare commits

..

16 Commits

Author SHA1 Message Date
Travis Rowland
0bc0efd3a5 Merge pull request #575 from alberto-bottarini/patch-1
Update ubuntu version in readme
2021-05-05 14:47:20 -07:00
Travis Rowland
4a7375f951 Merge pull request #581 from Amitie10g/patch-1
Add instructions to install "vagrant-disksize" plug-in
2021-05-05 14:33:24 -07:00
Travis Rowland
234e5e44c8 Merge pull request #582 from Amitie10g/patch-2
Update Vagrantfile to bring Ubuntu 20.04 (Focal Fossa)
2021-05-05 14:32:58 -07:00
Davod
fed52de0ed Update Vagrantfile to bring Ubuntu 20.04 (Focal Fossa) 2021-04-02 02:35:58 +02:00
Davod
36a5fe598c Add instructions to install "vagrant-disksize" plug-in
Add instructions to install "vagrant-disksize" plug-in in order to avoid "Unknown configuration section 'disksize'." error in Vagrantfile.
2021-04-02 02:31:58 +02:00
Travis Rowland
2122db3585 Merge pull request #570 from djdembeck/patch-1
Image uses 20.04 now
2021-01-20 11:49:44 -08:00
Alberto
35ecd32336 Update ubuntu version in readme 2021-01-08 23:17:30 +01:00
David Dembeck
e529c51d43 Image uses 20.04 now 2020-11-30 23:34:23 -06:00
David Dembeck
e792f509e3 Image uses 20.04 now 2020-11-30 23:34:11 -06:00
David Dembeck
8d281af10e Image uses 20.04 now 2020-11-30 23:32:50 -06:00
Travis Rowland
d0b467e4bf Forgot to remove failed archs in ARCHS environment variable 2020-10-05 21:43:40 -07:00
Travis Rowland
4646d893db Temporarily disabled failing arch builds
https://travis-ci.org/github/phusion/baseimage-docker/jobs/730061272
https://travis-ci.org/github/phusion/baseimage-docker/jobs/730061274
2020-10-05 21:40:23 -07:00
Travis Rowland
ec962400a5 Merge pull request #567 from MaxPeal/patch-1
RfC add all missing CPU Architectures form ubuntu
2020-09-24 13:02:01 -07:00
MaxPeal
1f44ae98c0 Update .travis.yml 2020-09-24 00:22:23 +02:00
Travis Rowland
aa1865e6f1 Merge pull request #561 from ngaro/travisconfig
Fix .travis.yml
2020-07-19 15:07:54 -07:00
Nikolas Garofil
7c61d44663 Fix .travis.yml 2020-07-18 22:02:43 +02:00
5 changed files with 19 additions and 10 deletions

View File

@@ -1,4 +1,6 @@
sudo: required
os: linux
dist: bionic
language: c
@@ -22,11 +24,12 @@ env:
# PLATFORM = Base image architecture to be used
# QEMU_ARCH = qemu binary to be downloaded from https://github.com/multiarch/qemu-user-static/releases
# TAG_ARCH = Tag to be applied to the image when upload to DockerHub
- PLATFORM=amd64 QEMU_ARCH=i386 TAG_ARCH=386
- PLATFORM=amd64 QEMU_ARCH=amd64 TAG_ARCH=amd64
- PLATFORM=arm64 QEMU_ARCH=aarch64 TAG_ARCH=arm64
- PLATFORM=arm QEMU_ARCH=arm TAG_ARCH=arm
stage: Compile
# - PLATFORM=arm QEMU_ARCH=arm TAG_ARCH=arm
- PLATFORM=ppc64le QEMU_ARCH=ppc64le TAG_ARCH=ppc64le
# - PLATFORM=s390x QEMU_ARCH=s390x TAG_ARCH=s390x
before_script:
- echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
@@ -43,7 +46,7 @@ jobs:
include:
- stage: deploy
env:
- ARCHS="amd64 arm64 arm"
- ARCHS="amd64 arm64 386 ppc64le"
script:
- echo $NAME:$VERSION_TAG
- echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin

View File

@@ -87,7 +87,7 @@ You can configure the stock `ubuntu` image yourself from your Dockerfile, so why
| Component | Why is it included? / Remarks |
| ---------------- | ------------------- |
| Ubuntu 18.04 LTS | The base system. |
| Ubuntu 20.04 LTS | The base system. |
| A **correct** init process | _Main article: [Docker and the PID 1 zombie reaping problem](http://blog.phusion.nl/2015/01/20/docker-and-the-pid-1-zombie-reaping-problem/)._ <br><br>According to the Unix process model, [the init process](https://en.wikipedia.org/wiki/Init) -- PID 1 -- inherits all [orphaned child processes](https://en.wikipedia.org/wiki/Orphan_process) and must [reap them](https://en.wikipedia.org/wiki/Wait_(system_call)). Most Docker containers do not have an init process that does this correctly. As a result, their containers become filled with [zombie processes](https://en.wikipedia.org/wiki/Zombie_process) over time. <br><br>Furthermore, `docker stop` sends SIGTERM to the init process, which stops all services. Unfortunately most init systems don't do this correctly within Docker since they're built for hardware shutdowns instead. This causes processes to be hard killed with SIGKILL, which doesn't give them a chance to correctly deinitialize things. This can cause file corruption. <br><br>Baseimage-docker comes with an init process `/sbin/my_init` that performs both of these tasks correctly. |
| Fixes APT incompatibilities with Docker | See https://github.com/dotcloud/docker/issues/1024. |
| syslog-ng | A syslog daemon is necessary so that many services - including the kernel itself - can correctly log to /var/log/syslog. If no syslog daemon is running, a lot of important messages are silently swallowed. <br><br>Only listens locally. All syslog messages are forwarded to "docker logs".<br><br>Why syslog-ng?<br>I've had bad experience with rsyslog. I regularly run into bugs with rsyslog, and once in a while it takes my log host down by entering a 100% CPU loop in which it can't do anything. Syslog-ng seems to be much more stable. |
@@ -585,6 +585,12 @@ Clone this repository:
Start a virtual machine with Docker in it. You can use the Vagrantfile that we've already provided.
First, install `vagrant-disksize` plug-in:
vagrant plugin install vagrant-disksize:
Then, start the virtual machine
vagrant up
vagrant ssh
cd /vagrant

View File

@@ -82,7 +82,7 @@ Baseimage-docker让这一切完美。在"内容"部分描述了所有这些修
| 模块 | 为什么包含这些?以及备注 |
| ---------------- | ------------------- |
| Ubuntu 18.04 LTS | 基础系统。 |
| Ubuntu 20.04 LTS | 基础系统。 |
| 一个**正确**的初始化进程 | *主要文章:[Docker和PID 1 僵尸进程回收问题](http://blog.phusion.nl/2015/01/20/docker-and-the-pid-1-zombie-reaping-problem/)*<br/><br/>根据Unix进程模型[初始化进程](https://en.wikipedia.org/wiki/Init) -- PID 1 -- 继承了所有[孤立的子进程](https://en.wikipedia.org/wiki/Orphan_process),并且必须[进行回收](https://en.wikipedia.org/wiki/Wait_(system_call))。大多数Docker容器没有一个初始化进程可以正确的完成此操作随着时间的推移会导致他们的容器出现了大量的[僵尸进程](https://en.wikipedia.org/wiki/Zombie_process)。<br/><br/>而且,`docker stop`发送SIGTERM信号给初始化进程照理说此信号应该可以停止所有服务。不幸的是由于它们对硬件进行了关闭操作导致Docker内的大多数初始化系统没有正确执行。这会导致进程强行被SIGKILL信号关闭从而丧失了一个正确取消初始化设置的机会。这会导致文件损坏。<br/><br/>Baseimage-docker配有一个名为`/sbin/my_init`的初始化进程来同时正确的完成这些任务。 |
| 修复了APT与Docker不兼容的问题 | 详情参见https://github.com/dotcloud/docker/issues/1024 。 |
| syslog-ng | 对于很多服务包括kernel自身都需要一个syslog后台进程以便可以正确的将log输出到/var/log/syslog中。如果没有运行syslog后台进程很多重要的信息就会默默的丢失了。<br/><br/>只对本地进行监听。所有syslog信息会被转发给“docker logs”。 |

View File

@@ -82,7 +82,7 @@ Baseimage-docker讓這一切完美。在"內容"部分描述了所有這些修
| 模塊 | 爲什麼包含這些?以及備註 |
| ---------------- | ------------------- |
| Ubuntu 18.04 LTS | 基礎系統。 |
| Ubuntu 20.04 LTS | 基礎系統。 |
| 一個**正確**的初始化行程 | *主要文章:[Docker和PID 1 殭屍行程回收問題](http://blog.phusion.nl/2015/01/20/docker-and-the-pid-1-zombie-reaping-problem/)*<br/><br/>根據Unix行程模型[初始化行程](https://en.wikipedia.org/wiki/Init) -- PID 1 -- 繼承了所有[孤立的子行程](https://en.wikipedia.org/wiki/Orphan_process),並且必須[進行回收](https://en.wikipedia.org/wiki/Wait_(system_call))。大多數Docker容器沒有一個初始化行程可以正確的完成此操作隨着時間的推移會導致他們的容器出現了大量的[殭屍行程](https://en.wikipedia.org/wiki/Zombie_process)。<br/><br/>而且,`docker stop`發送SIGTERM信號給初始化行程照理說此信號應該可以停止所有服務。不幸的是由於它們對硬體進行了關閉操作導致Docker內的大多數初始化系統沒有正確執行。這會導致行程強行被SIGKILL信號關閉從而喪失了一個正確取消初始化設置的機會。這會導致文件損壞。<br/><br/>Baseimage-docker配有一個名爲`/sbin/my_init`的初始化行程來同時正確的完成這些任務。 |
| 修復了APT與Docker不兼容的問題 | 詳情參見https://github.com/dotcloud/docker/issues/1024 。 |
| syslog-ng | 對於很多服務包括kernel自身都需要一個syslog後臺行程以便可以正確的將log輸出到/var/log/syslog中。如果沒有運行syslog後臺行程很多重要的信息就會默默的丟失了。<br/><br/>只對本地進行監聽。所有syslog信息會被轉發給“docker logs”。 |

2
Vagrantfile vendored
View File

@@ -12,7 +12,7 @@ Vagrant.configure("2") do |config|
# Every Vagrant development environment requires a box. You can search for
# boxes at https://atlas.hashicorp.com/search.
config.vm.box = "ubuntu/bionic64"
config.vm.box = "ubuntu/focal64"
config.disksize.size = '50GB'
# Disable automatic box update checking. If you disable this, then