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

Compare commits

base: Docker:0.10.1
Branches Tags
Docker:master Docker:copilot/fix-gh-release-403-error Docker:copilot/create-gh-releases-for-images Docker:gh-pages
Docker:noble-1.0.2 Docker:noble-1.0.1 Docker:noble-1.0.0 Docker:jammy-1.0.4 Docker:jammy-1.0.3 Docker:jammy-1.0.2 Docker:jammy-1.0.1 Docker:dev-jammy-1.1.0 Docker:jammy-1.0.0 Docker:focal-1.2.0 Docker:focal-1.0.0 Docker:focal-1.0.0-alpha1 Docker:focal-1.0.0alpha1 Docker:18.04-1.0.0 Docker:bionic-1.0.0 Docker:0.11 Docker:0.10.2 Docker:0.9.19-armhf Docker:0.10.1 Docker:0.10.0 Docker:0.9.22 Docker:0.9.21 Docker:0.9.20 Docker:rel-0.9.19 Docker:rel-0.9.18 Docker:rel-0.9.17 Docker:rel-0.9.16 Docker:rel-0.9.15 Docker:rel-0.9.14 Docker:rel-0.9.13 Docker:rel-0.9.12 Docker:rel-0.9.11 Docker:rel-0.9.10 Docker:rel-0.9.9 Docker:rel-0.9.8 Docker:rel-0.9.7 Docker:rel-0.9.6 Docker:rel-0.9.5 Docker:rel-0.9.4 Docker:rel-0.9.3 Docker:rel-0.9.2 Docker:rel-0.9.1 Docker:rel-0.9.0
..
compare: Docker:0.10.2
Branches Tags
Docker:master Docker:copilot/fix-gh-release-403-error Docker:copilot/create-gh-releases-for-images Docker:gh-pages
Docker:noble-1.0.2 Docker:noble-1.0.1 Docker:noble-1.0.0 Docker:jammy-1.0.4 Docker:jammy-1.0.3 Docker:jammy-1.0.2 Docker:jammy-1.0.1 Docker:dev-jammy-1.1.0 Docker:jammy-1.0.0 Docker:focal-1.2.0 Docker:focal-1.0.0 Docker:focal-1.0.0-alpha1 Docker:focal-1.0.0alpha1 Docker:18.04-1.0.0 Docker:bionic-1.0.0 Docker:0.11 Docker:0.10.2 Docker:0.9.19-armhf Docker:0.10.1 Docker:0.10.0 Docker:0.9.22 Docker:0.9.21 Docker:0.9.20 Docker:rel-0.9.19 Docker:rel-0.9.18 Docker:rel-0.9.17 Docker:rel-0.9.16 Docker:rel-0.9.15 Docker:rel-0.9.14 Docker:rel-0.9.13 Docker:rel-0.9.12 Docker:rel-0.9.11 Docker:rel-0.9.10 Docker:rel-0.9.9 Docker:rel-0.9.8 Docker:rel-0.9.7 Docker:rel-0.9.6 Docker:rel-0.9.5 Docker:rel-0.9.4 Docker:rel-0.9.3 Docker:rel-0.9.2 Docker:rel-0.9.1 Docker:rel-0.9.0

12 Commits
0.10.1 ... 0.10.2

Author SHA1 Message Date
Travis Rowland
becf747182 Update Makefile 2018-08-15 23:47:10 -07:00
Travis Rowland
673cd89f41 Merge pull request #501 from davidbernick/bernick_18.04 
syslog fix
 2018-07-18 08:18:17 -07:00
Travis Rowland
8cf2e208ff Merge branch 'master' into bernick_18.04 2018-07-18 08:17:52 -07:00
Travis Rowland
924f874d7e Update Dockerfile 2018-07-18 08:17:29 -07:00
Travis Rowland
b89b718067 Merge pull request #497 from rwky/logrotate-permissions-fix 
Fix /var/log permissions on syslog-ng startup
 2018-07-18 08:09:40 -07:00
Travis Rowland
422781c7cf Merge branch 'master' into logrotate-permissions-fix 2018-07-18 08:08:34 -07:00
Travis Rowland
ed15d0d250 Merge pull request #487 from unilynx/support-maketest-on-osx 
Allow 'make test' to work on macOS by publishing the SSH port
 2018-07-18 07:45:32 -07:00
David Bernick
a018aba0c2 syslog fix 2018-07-16 12:46:18 -04:00
Rowan Wookey
dd9d23f1ea Fix /var/log permissions on syslog-ng startup 2018-06-30 10:58:14 +01:00
Arnold Hendriks
2f0e1ad0b8 Allow 'make test' to work on macOS by publishing the SSH port and using that during tests, as the IP address cannot be directly reached on macOS docker 2018-04-09 23:08:01 +02:00
Travis Rowland
92a357a41f Merge pull request #478 from andres-h/master 
fix syslog reload
 2018-04-02 00:49:31 -07:00
Andres Heinloo
cb8cd8ad82 fix syslog reload 2018-03-16 18:24:00 +01:00
5 changed files with 18 additions and 10 deletions
Expand all files Collapse all files

2
Makefile
View File

@@ -1,5 +1,5 @@
NAME = phusion/baseimage
VERSION = 0.10.1
VERSION = 0.10.2
.PHONY: all build test tag_latest release ssh

8
image/services/syslog-ng/logrotate_syslogng
View File

@@ -7,7 +7,9 @@
delaycompress
compress
postrotate
sv reload syslog-ng > /dev/null
if [ -f /var/run/syslog-ng.pid ]; then
kill -HUP `cat /var/run/syslog-ng.pid`
fi
endscript
}
@@ -32,6 +34,8 @@
delaycompress
sharedscripts
postrotate
sv reload syslog-ng > /dev/null
if [ -f /var/run/syslog-ng.pid ]; then
kill -HUP `cat /var/run/syslog-ng.pid`
fi
endscript
}

2
image/services/syslog-ng/syslog-ng.conf
View File

@@ -54,7 +54,7 @@ destination d_newscrit { file("/var/log/news/news.crit"); };
destination d_newserr { file("/var/log/news/news.err"); };
destination d_newsnotice { file("/var/log/news/news.notice"); };
# Some `catch-all' logfiles.
# Some 'catch-all' logfiles.
#
destination d_debug { file("/var/log/debug"); };
destination d_error { file("/var/log/error"); };

4
image/services/syslog-ng/syslog-ng.init
View File

@@ -14,6 +14,10 @@ else
sed -i 's/##SYSLOG_OUTPUT_MODE_DEV_STDOUT##/file/' /etc/syslog-ng/syslog-ng.conf
fi
# If /var/log is writable by another user logrotate will fail
/bin/chown root:root /var/log
/bin/chmod 0755 /var/log
PIDFILE="/var/run/syslog-ng.pid"
SYSLOGNG_OPTS=""

12
test/runner.sh
View File

@@ -17,13 +17,13 @@ function cleanup()
PWD=`pwd`
echo " --> Starting insecure container"
ID=`docker run -d -v $PWD/test:/test $NAME:$VERSION /sbin/my_init --enable-insecure-key`
ID=`docker run -d -p 22 -v $PWD/test:/test $NAME:$VERSION /sbin/my_init --enable-insecure-key`
sleep 1
echo " --> Obtaining IP"
IP=`docker inspect -f "{{ .NetworkSettings.IPAddress }}" "$ID"`
if [[ "$IP" = "" ]]; then
abort "Unable to obtain container IP"
echo " --> Obtaining SSH port number"
SSHPORT=`docker inspect --format='{{(index (index .NetworkSettings.Ports "22/tcp") 0).HostPort}}' "$ID"`
if [[ "$SSHPORT" = "" ]]; then
abort "Unable to obtain container SSH port number"
fi
trap cleanup EXIT
@@ -38,5 +38,5 @@ echo " --> Logging into container and running tests"
cp image/services/sshd/keys/insecure_key /tmp/insecure_key
chmod 600 /tmp/insecure_key
sleep 1 # Give container some more time to start up.
ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i /tmp/insecure_key root@$IP \
ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i /tmp/insecure_key -p $SSHPORT root@127.0.0.1 \
/bin/bash /test/test.sh