mirror of
https://github.com/adferrand/docker-backuppc.git
synced 2023-11-05 04:40:26 +01:00
Merge branch '4'
# Conflicts: # README.md
This commit is contained in:
commit
28a600c0e3
@ -4,7 +4,13 @@
|
||||
|
||||
## [4.2.1-1] - 14/05/2018
|
||||
### Added
|
||||
* Create this CHANGELOG.md
|
||||
* Set up a complete CI/CD system for this Docker, using CircleCI: docker is noz automatically packaged, tested and deployed to Docker Hub
|
||||
|
||||
### Changed
|
||||
* Hotfix for BZIP2 binary, due to latest Alpine layout modifications, is now applied when the container is created, removing the error `n: /bin/bzip2: File exists` when container is restarted.
|
||||
|
||||
## [4.2.1-1] - 14/05/2018
|
||||
### Added
|
||||
* Add and configure circus, an alternative to supervisor, compatible with Python 3, with better control over environment variables propagation, and network sockets supervision (not used yet here)
|
||||
* Mandatory perl modules for Backuppc are now installed as pre-compiled binaries from Alpine repos
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
# ![](https://raw.githubusercontent.com/adferrand/docker-backuppc/master/images/logo_200px.png) adferrand/backuppc
|
||||
![](https://img.shields.io/badge/tags-4%20latest-lightgrey.svg) [![](https://images.microbadger.com/badges/version/adferrand/backuppc:4.2.1-1.svg) ![](https://images.microbadger.com/badges/image/adferrand/backuppc:4.2.1-1.svg)](https://microbadger.com/images/adferrand/backuppc:4.2.1-1) [![CircleCI](https://circleci.com/gh/adferrand/docker-backuppc/tree/master.svg?style=shield)](https://circleci.com/gh/adferrand/docker-backuppc/tree/master)
|
||||
![](https://img.shields.io/badge/tags-4%20latest-lightgrey.svg) [![](https://images.microbadger.com/badges/version/adferrand/backuppc:4.2.1-2.svg) ![](https://images.microbadger.com/badges/image/adferrand/backuppc:4.2.1-2.svg)](https://microbadger.com/images/adferrand/backuppc:4.2.1-2) [![CircleCI](https://circleci.com/gh/adferrand/docker-backuppc/tree/master.svg?style=shield)](https://circleci.com/gh/adferrand/docker-backuppc/tree/master)
|
||||
|
||||
* [Container functionalities](#container-functionalities)
|
||||
* [About BackupPC](#about-backuppc)
|
||||
|
@ -10,6 +10,9 @@ if [ -f /firstrun ]; then
|
||||
echo 'First run of the container. BackupPC will be installed.'
|
||||
echo 'If exist, configuration and data will be reused and upgraded as needed.'
|
||||
|
||||
# Executable bzip2 seems to have been moved into /usr/bin in latest Alpine version. Fix that.
|
||||
ln -s /usr/bin/bzip2 /bin/bzip2
|
||||
|
||||
# Configure timezone if needed
|
||||
if [ -n "$TZ" ]; then
|
||||
cp /usr/share/zoneinfo/$TZ /etc/localtime
|
||||
@ -99,9 +102,6 @@ export BACKUPPC_GUID
|
||||
export BACKUPPC_USERNAME
|
||||
export BACKUPPC_GROUPNAME
|
||||
|
||||
# Executable bzip2 seems to have been moved into /usr/bin in latest Alpine version. Fix that.
|
||||
ln -s /usr/bin/bzip2 /bin/bzip2
|
||||
|
||||
# Exec given CMD in Dockerfile
|
||||
cd /home/backuppc
|
||||
exec "$@"
|
||||
|
Loading…
Reference in New Issue
Block a user