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

594 Commits

Author SHA1 Message Date
Charles Ng
1443b1f199 Update syslog-ng.conf from Ubuntu 20.04 2021-05-21 08:03:57 +00:00
Travis Rowland
51e4f87c7e Merge pull request #590 from Konnichy/master
(fix) Duplicate logrotate entries #584
2021-05-14 08:30:14 -07:00
Konnichy
b43059907a (fix) Duplicate logrotate entries #584 2021-05-13 00:38:09 +00:00
Travis Rowland
0bc0efd3a5 Merge pull request #575 from alberto-bottarini/patch-1
Update ubuntu version in readme
focal-1.0.0
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
Travis Rowland
5078b027ba Update Makefile
Increment version
focal-1.0.0alpha1 focal-1.0.0-alpha1
2020-06-04 02:23:15 -07:00
Travis Rowland
c2265dfda8 Merge pull request #555 from samip5/upgrade-to-ubuntu-focal
Upgrade to Ubuntu Focal (20.04)
2020-06-04 02:12:24 -07:00
Travis Rowland
1a389f0456 Merge branch 'master' into upgrade-to-ubuntu-focal 2020-06-04 01:59:29 -07:00
Travis Rowland
453f835df0 MAINTAINER has been deprecated 18.04-1.0.0 bionic-1.0.0 2020-05-29 13:15:25 -07:00
Travis Rowland
e701f1a32b Cleaning up build process 2020-05-29 13:13:36 -07:00
Skyler Mäntysaari
a418256b45 Upgraded BASE_IMAGE to 20.04. 2020-05-03 19:00:15 +03:00
Travis Rowland
541c9a075f Merge pull request #553 from bestlong/patch-2
Fix Docker registry URL
2020-04-20 16:43:28 -07:00
Shao Yu-Lung (Allen)
1115e802ee Fix Docker registry URL 2020-04-16 09:53:08 +08:00
Travis Rowland
c87dcdf546 Merge pull request #535 from CodeCutterUK/multi-arch-build
Further improvements to the multi-arch build
2019-06-11 11:00:06 -07:00
Mark Ison
9c9ffde394 Ensure building multiarch works when the image name isn't overridden
Stop tagging latest by when running the make release step
2019-05-31 08:30:02 +01:00
Travis Rowland
b5c34e9776 Merge pull request #534 from CodeCutterUK/multi-arch-build
Multiarch implementation for amd64, arm64 and arm32
2019-05-29 18:47:29 -07:00
Mark Ison
e4ae9aac10 Multiarch implementation for amd64, arm64 and arm32 2019-05-22 16:27:12 +01:00
Travis Rowland
e97d8464b9 Merge pull request #530 from iaon/master
Touch cron files to fix 'NUMBER OF HARD LINKS > 1' issue.
2019-05-10 17:04:14 -07:00
Travis Rowland
0dc0303a03 Merge branch 'master' into master 2019-05-10 17:04:02 -07:00
Travis Rowland
fc6672b4bb Merge pull request #527 from scrapinghub/master
Ability to override ubuntu:18.04
2019-05-10 16:53:10 -07:00
Matyas Markovics
d616b3bafb fix for 'ttyname failed: Inappropriate ioctl for device' during make test 2019-04-17 10:08:26 +02:00
Matyas Markovics
89597c5bc5 Use tools/docker-ssh in make ssh and in test/runner.sh to connect to container via SSH, fix SSH connection by IP issue on Mac-OS 2019-04-08 09:49:13 +02:00
Matyas Markovics
36bd41108f Default to ubuntu BASE_IMAGE in Dockerfile, modify make to only add --build-arg to build target if BASE_IMAGE is defined, document the use of BASE_IMAGE in README 2019-04-08 09:45:37 +02:00
Ivan Onushkin
386b8284d8 Touch cron files to fix 'NUMBER OF HARD LINKS > 1' issue. 2019-04-05 20:57:00 +03:00
Matyas Markovics
6d6395c58f invoke make from travis 2019-03-13 11:34:47 +01:00
Matyas Markovics
4a3476b6a6 send tests over in ssh, instead of mounting them 2019-03-13 11:09:41 +01:00
Matyas Markovics
ad88ec9226 ssh by IP in test; verbose SSH into container 2019-03-13 10:37:56 +01:00
Matyas Markovics
17a737f47b remove interactive and TTY flags when Enabling SSH in test 2019-03-13 10:12:22 +01:00
Matyas Markovics
9d29b23db2 exclude mounts (e.g.: /proc) from cleanup 2019-03-13 09:59:33 +01:00
Matyas Markovics
089258a746 if both NAME and BASE_IMAGE are defined, don't append variant to baseimage 2019-03-13 01:00:13 +01:00
Matyas Markovics
4f65f0a270 build-arg to define base-image, fix locale for Debian 2019-03-12 23:28:58 +01:00
Travis Rowland
14394bcb3f Merge pull request #523 from pmav99/python_bytecode
Remove python bytecode
2019-01-14 06:57:56 -08:00
Travis Rowland
a9fdb8878d Merge pull request #522 from silke/master
Fixed wrong line breaks in syslog-ng's logrotate config
2019-01-14 06:57:10 -08:00
Panos Mavrogiorgos
d0b150c5ef Remove python bytecode 2019-01-04 08:18:58 +02:00
Silke Meyer
c18b511311 Fixed wrong line breaks in syslog-ng's logrotate config 2018-12-25 10:34:05 +01:00
Travis Rowland
60e2cdd375 Merge pull request #520 from kingdonb/issue-459
addressing the confusion in issue #459
2018-11-26 11:00:38 -08:00