Commit Graph

339 Commits

Author SHA1 Message Date
Travis Rowland
70e2551ca7 Merge pull request #369 from kingdonb/i386-next
WIP: fix libgc bug for i386 baseimage-docker
2017-03-20 20:37:33 -07:00
Kingdon Barrett
9fed983d80 services/cron sshd syslog-ng are all directories
rm -f balks at wiping them out
2017-03-21 03:17:24 +00:00
Kingdon Barrett
2a9860b120 packages don't exist and aren't build deps on i386 2017-03-21 03:07:34 +00:00
Kingdon Barrett
a09aae6dba fix libgc bug for i386 baseimage-docker 2017-03-21 02:40:54 +00:00
Travis Rowland
8c842a35d7 Merge pull request #188 from endersonmaia/preserve-some-build-scripts
Preserve /build/{cleanup.sh,buildconfig} files.
2017-03-20 12:43:06 -07:00
Enderson Maia
e019d5fa11 Preserve /build/{cleanup.sh,buildconfig} files.
These files are useful for those who create Docker images based on this
baseimage, and need to make a final cleanup and/or use some
configurations that are inside buildconfig file.
2017-03-20 09:35:54 -03:00
Travis Rowland
75784205cf Merge branch 'pavlobaron-master' into next 2017-03-19 16:18:16 -07:00
Travis Rowland
d9e762730a cleaning up getter/setter for KILL_PROCESS_TIMEOUT/KILL_ALL_PROCESSES_TIMEOUT 2017-03-19 16:17:52 -07:00
Travis Rowland
7ec5a0a65f Merge branch 'master' of https://github.com/pavlobaron/baseimage-docker into pavlobaron-master 2017-03-19 16:15:04 -07:00
Travis Rowland
5cc60221e6 Document selection of syslog-ng over rsyslog
Fixes #114
2017-03-19 01:57:18 -07:00
Travis Rowland
15e27eefe6 Merge pull request #363 from lukecampbell/setuser
Cleanup and improves readability of setuser
2017-03-19 01:32:30 -07:00
Travis Rowland
1c6b9f11d1 Merge pull request #354 from wangyuehong/master
fix typos for README_ZH_cn_.md and README_ZH_tw_.md
2017-03-19 01:30:40 -07:00
Travis Rowland
e12eeb8083 Merge pull request #352 from jedie/patch-2
README: "RUN chmod +x /etc/my_init.d/logtime.sh"
2017-03-19 01:29:46 -07:00
Travis Rowland
d8a7ca7a4d Merge branch 'next' into patch-2 2017-03-19 01:29:24 -07:00
Travis Rowland
96a2d92978 Merge pull request #351 from jedie/patch-1
README: "RUN chmod +x /etc/service/memcached/run"
2017-03-19 01:26:04 -07:00
Travis Rowland
67a0c6d121 Merge branch 'next' into patch-1 2017-03-19 01:25:43 -07:00
Travis Rowland
1811cb7530 Merge pull request #348 from milinnovations/fix_cron_pam
Provided a fix for cron not working out of the box.
2017-03-19 01:20:24 -07:00
Travis Rowland
fdda2d42bf Merge pull request #339 from zhouhaibing089/logrotate-fix
override the logrotate.conf without `su root syslog` Fixes #338
2017-03-19 01:07:02 -07:00
Travis Rowland
4e5a7e91ce Merge pull request #336 from axilleas/fix-locales
Reconfigure locales and expose them in Dockerfile
2017-03-19 01:04:14 -07:00
Travis Rowland
e89e07acb5 Merge pull request #334 from nawork/master
Removing -f option of `docker tag`
2017-03-19 01:01:55 -07:00
Travis Rowland
116cf0e2dd Merge pull request #209 from pbecotte/master
Add instructions for enabling sshd on the fly without permanently enabli...
2017-03-19 00:26:28 -07:00
Travis Rowland
241c41e093 Merge pull request #203 from UnrealQuester/copy
Use COPY instead of ADD
2017-03-19 00:21:29 -07:00
Luke Campbell
ffb22ecf60 Cleanup and improves readability of setuser 2017-02-24 12:03:53 -05:00
wangyuehong
7400c0b3b8 typo fix for README_ZH_cn_.md and README_ZH_tw_.md 2016-12-02 23:30:13 +09:00
Jens Diemer
4e80b8540a RUN chmod +x 2016-11-29 12:18:43 +01:00
Jens Diemer
9920d9d834 RUN chmod +x /etc/service/memcached/run is needed.
otherwise i get the error:
```
fatal: unable to start ./run: access denied
```
2016-11-29 12:05:34 +01:00
Matěj Týč
ac1211b0ed Provided a fix for cron not working out of the box. 2016-11-15 16:41:47 +01:00
Achilleas Pipinellis
bb3fef5377 Expose the locales in Dockerfile
While the locales are generated with locale-gen, this does not enforce
the en_US.UTF-8 locale inside the container.

See the following links for more information:

- https://github.com/docker/docker/issues/2424
- http://jaredmarkell.com/docker-and-locales/
2016-09-12 09:49:24 +02:00
zhouhaibing089
d3eceae5ef override the logrotate.conf without su root syslog 2016-09-12 10:49:28 +08:00
Andreas Elvers
ecdbe62eca Removing -f option of docker tag since this option is gone in docker 1.12.0. 2016-08-24 15:44:16 +02:00
Hongli Lai (Phusion)
24b8bcebc8 Fix 0.9.19 release date 2016-07-08 22:51:43 +02:00
Hongli Lai (Phusion)
096c0d4d2e Prepare for 0.9.19 release 2016-07-08 20:27:23 +02:00
Hongli Lai (Phusion)
ce8fc04b74 Add marketing blurb as suggested by GH-298 2016-07-08 20:25:11 +02:00
Hongli Lai (Phusion)
9001796aa8 Upon rotating /var/log/syslog, restart syslog-forwarder 2016-07-08 20:20:25 +02:00
Hongli Lai (Phusion)
c6cc1cb8e9 Credit Ernestas Lukoševičius 2016-07-08 20:17:21 +02:00
Ernestas Lukoševičius
50db81d8be Fix incorrect runit service name for syslog tail
Closes GH-292.
2016-07-08 20:16:33 +02:00
Hongli Lai (Phusion)
82862ec7f7 Do not set the APT force-unsafe-io flag
Docker already does this for us. Closes GH-265.
2016-07-08 20:09:24 +02:00
Hongli Lai (Phusion)
3edd5d1564 Fixes a problem in PAM which may cause chpasswd and related tools to fail
This is caused by Docker bug 6345 which is already closed, but for some
reason the problem still persists. Closes GH-181. Patch contributed
by Michael Zedeler.
2016-07-08 20:00:02 +02:00
Hongli Lai (Phusion)
6d5518974f Fix typo in my_init 2016-07-08 18:50:44 +02:00
Hongli Lai (Phusion)
a81f293bfb Update Ubuntu version mentions in READMEs 2016-07-08 18:42:03 +02:00
Hongli Lai (Phusion)
c93a14391a During shutdown, repeatedly tell Runit to shutdown services
Works around a potential race condition in Runit itself.
Closes GH-315. Thanks to Chris Kite for submitting this patch.
2016-07-08 18:37:03 +02:00
Hongli Lai (Phusion)
1f39ac326f Update Changelog 2016-07-08 18:07:54 +02:00
Hongli Lai (Phusion)
823ff30f36 Merge pull request #284
Changes to upgrade this to Ubuntu-16.04
2016-07-08 18:05:58 +02:00
Pierre Jacomet
e436d1c4af Changes to upgrade this to Ubuntu-16.04 2016-04-28 19:10:08 -07:00
Hongli Lai
5f0849ba4b Merge pull request #284 from BlackGlory/patch-1
Remove the original content has been translated
2016-04-06 15:00:25 +02:00
BlackGlory
3fe0878edb Remove the original content has been translated 2016-02-05 19:10:19 +08:00
pavlobaron
ea6b0ace79 configure process kill timeouts through environment with fallbacks 2016-01-22 09:49:48 +01:00
Alexander Buddenbrock
17eadef537 Use COPY instead of ADD
While COPY and ADD are essentially interchangeable here, it is still
considered good practice to use COPY whenever possible. From the docker
docks on best practices:

"Although ADD and COPY are functionally similar, generally speaking,
COPY is preferred. That’s because it’s more transparent than ADD.
[...] For other items (files, directories) that do not require ADD’s tar
auto-extraction capability, you should always use COPY."

Additionally, ADD commands were not cached prior to 0.7.3 (which was
released on 2013-01-02).
2015-12-14 21:34:23 +01:00
Hongli Lai (Phusion)
8ec76f25ca Update Changelog 2015-12-08 12:32:52 +01:00
Hongli Lai (Phusion)
6052c7a3e7 Merge branch 'next' 2015-12-08 12:31:34 +01:00