Iwan/baseimage-docker_fr
1
0
Fork 0
forked from Docker/baseimage-docker
Code Issues Pull Requests Releases Wiki Activity
354 Commits 5 Branches 0 Tags
00034a9965a3e802b79d15cc6417945f7afe7b4f
Commit Graph

354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kingdon Barrett
00034a9965 Fix grammar 
Looks like a proofreading error
 2017-03-21 09:26:00 -04:00
Travis Rowland
17a5cede8c Incrementing version 2017-03-21 03:37:18 -07:00
Travis Rowland
f7bba93be3 Preserve /build/{cleanup.sh,buildconfig} files. See #188 2017-03-21 03:37:00 -07:00
Travis Rowland
6216f70411 Revert "Merge branch 'i386' into next" 
This reverts commit 34408d8013, reversing
changes made to 5d80f284b0.
 2017-03-21 03:15:25 -07:00
Travis Rowland
34408d8013 Merge branch 'i386' into next 2017-03-21 03:06:29 -07:00
Travis Rowland
5d80f284b0 Merge pull request #374 from romantic668/next 
Update README.md
 2017-03-21 02:49:26 -07:00
Travis Rowland
e3eeed2091 Merge pull request #376 from phusion/revert-188-preserve-some-build-scripts 
Revert "Preserve /build/{cleanup.sh,buildconfig} files."
 2017-03-21 02:48:11 -07:00
Travis Rowland
f9838ccce0 Revert "Preserve /build/{cleanup.sh,buildconfig} files." 2017-03-21 02:41:20 -07:00
romantic668
ce5038b2a7 Update README.md 
Hi, I am doing a technical writing project. It is good practice to keep the writing concise. For example, I removed ...supposed to... Though it may lead to loss in meaning, readers will benefit from this concision. Hope it helps
 2017-03-21 02:20:17 -07:00
Travis Rowland
c1d2b4bad8 Update README.md 
Adding travis-ci badge to README.md
 2017-03-21 01:49:54 -07:00
Travis Rowland
8f33bcf3d2 Create .travis.yml 
Adding Travis-CI
 2017-03-21 01:26:07 -07:00
Travis Rowland
ce2a25ddc0 Merge pull request #372 from phusion/next 
Update README.md regarding ignored env vars.
 2017-03-20 21:00:29 -07:00
Travis Rowland
7e02e426e5 Update README.md regarding ignored env vars. 
Closes #119
 2017-03-20 20:59:39 -07:00
Travis Rowland
cc1659b829 Merge pull request #371 from phusion/next 
Updating README.md Fixes #228
 2017-03-20 20:50:52 -07:00
Travis Rowland
5205fa04f7 Updating README.md Fixes #228 2017-03-20 20:48:24 -07:00
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