Skip to content
This repository was archived by the owner on Jan 7, 2024. It is now read-only.

Commit e399791

Browse files
authored
Merge pull request #47 from linuxserver/logrotate
2 parents 149afc7 + 4434148 commit e399791

File tree

7 files changed

+10
-5
lines changed

7 files changed

+10
-5
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG BUILD_DATE
55
ARG VERSION
66
ARG UNIFI_VERSION
77
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
8-
LABEL maintainer="sparklyballs"
8+
LABEL maintainer="aptalca"
99

1010
# environment settings
1111
ARG UNIFI_BRANCH="stable"
@@ -20,6 +20,7 @@ RUN \
2020
apt-get install -y \
2121
binutils \
2222
jsvc \
23+
logrotate \
2324
mongodb-org-server \
2425
openjdk-8-jre-headless \
2526
wget && \

Dockerfile.aarch64

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG BUILD_DATE
55
ARG VERSION
66
ARG UNIFI_VERSION
77
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
8-
LABEL maintainer="sparklyballs"
8+
LABEL maintainer="aptalca"
99

1010
# environment settings
1111
ARG UNIFI_BRANCH="stable"
@@ -20,6 +20,7 @@ RUN \
2020
apt-get install -y \
2121
binutils \
2222
jsvc \
23+
logrotate \
2324
mongodb-org-server \
2425
openjdk-8-jre-headless \
2526
wget && \

Dockerfile.armhf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG BUILD_DATE
55
ARG VERSION
66
ARG UNIFI_VERSION
77
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
8-
LABEL maintainer="sparklyballs"
8+
LABEL maintainer="aptalca"
99

1010
# environment settings
1111
ARG UNIFI_BRANCH="stable"
@@ -17,6 +17,7 @@ RUN \
1717
apt-get install -y \
1818
binutils \
1919
jsvc \
20+
logrotate \
2021
mongodb-server \
2122
openjdk-8-jre-headless \
2223
wget && \

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pipeline {
2929
CI_WEB='true'
3030
CI_PORT='8443'
3131
CI_SSL='true'
32-
CI_DELAY='120'
32+
CI_DELAY='180'
3333
CI_DOCKERENV='TZ=US/Pacific'
3434
CI_AUTH='user:password'
3535
CI_WEBPATH=''

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
265265

266266
## Versions
267267

268+
* **16.06.20:** - Add logrotate.
268269
* **02.06.20:** - Updated port list & descriptions. Moved some ports to optional.
269270
* **14.11.19:** - Changed url for deb package to match new Ubiquity domain.
270271
* **29.07.19:** - Allow for changing Java mem limit via new optional environment variable.

jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ repo_vars:
2121
- CI_WEB='true'
2222
- CI_PORT='8443'
2323
- CI_SSL='true'
24-
- CI_DELAY='120'
24+
- CI_DELAY='180'
2525
- CI_DOCKERENV='TZ=US/Pacific'
2626
- CI_AUTH='user:password'
2727
- CI_WEBPATH=''

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ app_setup_block: |
7878
7979
# changelog
8080
changelogs:
81+
- { date: "16.06.20:", desc: "Add logrotate."}
8182
- { date: "02.06.20:", desc: "Updated port list & descriptions. Moved some ports to optional."}
8283
- { date: "14.11.19:", desc: "Changed url for deb package to match new Ubiquity domain." }
8384
- { date: "29.07.19:", desc: "Allow for changing Java mem limit via new optional environment variable." }

0 commit comments

Comments
 (0)