Skip to content

Commit 2191666

Browse files
authored
Merge pull request #2 from linuxserver/fix-alias
Fix alias
2 parents 7b9a463 + 85c21d5 commit 2191666

5 files changed

Lines changed: 7 additions & 13 deletions

File tree

Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ pipeline {
2929
PR_DOCKERHUB_IMAGE = 'lspipepr/kimai'
3030
DIST_IMAGE = 'alpine'
3131
MULTIARCH='true'
32-
CI='true'
33-
CI_WEB='true'
32+
CI='false'
33+
CI_WEB='false'
3434
CI_PORT='80'
3535
CI_SSL='false'
3636
CI_DELAY='120'
37-
CI_DOCKERENV='TZ=US/Pacific|TEST_RUN=1'
37+
CI_DOCKERENV='TZ=US/Pacific'
3838
CI_AUTH='user:password'
3939
CI_WEBPATH=''
4040
}

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ Find us at:
3838
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/kimai.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/kimai)
3939
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/kimai.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/kimai)
4040
[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-kimai%2Fjob%2Fmain%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-kimai/job/main/)
41-
[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fkimai%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/kimai/latest/index.html)
4241

4342
[Kimai](https://kimai.org/) is a professional grade time-tracking application, free and open-source.
4443
It handles use-cases of freelancers as well as companies with dozens or hundreds of users.

jenkins-vars.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ repo_vars:
2020
- PR_DOCKERHUB_IMAGE = 'lspipepr/kimai'
2121
- DIST_IMAGE = 'alpine'
2222
- MULTIARCH='true'
23-
- CI='true'
24-
- CI_WEB='true'
23+
- CI='false'
24+
- CI_WEB='false'
2525
- CI_PORT='80'
2626
- CI_SSL='false'
2727
- CI_DELAY='120'
28-
- CI_DOCKERENV='TZ=US/Pacific|TEST_RUN=1'
28+
- CI_DOCKERENV='TZ=US/Pacific'
2929
- CI_AUTH='user:password'
3030
- CI_WEBPATH=''
3131
sponsor_links:

root/etc/s6-overlay/s6-rc.d/init-kimai-config/run

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
#!/usr/bin/with-contenv bash
22
# shellcheck shell=bash
33

4-
# Echo init finish for test runs
5-
if [ -n "${TEST_RUN}" ]; then
6-
echo '[ls.io-init] done.'
7-
fi
8-
94
DB_VALID=$(php -r 'echo filter_var(getenv("DATABASE_URL"), FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED);')
105

116
if [[ ${DATABASE_URL+x} == "" ]] || [[ ${DB_VALID+x} == "NULL" ]]; then

root/usr/bin/console

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/with-contenv bash
22
# shellcheck shell=bash
33

4-
s6-setuidgid abc cd /app/www php -d memory_limit=-1 bin/console "$*"
4+
s6-setuidgid abc cd /app/www /bin/bash -c "php -d memory_limit=-1 bin/console $*"

0 commit comments

Comments
 (0)