Skip to content

Commit

Permalink
Merge pull request #2 from linuxserver/fix-alias
Browse files Browse the repository at this point in the history
Fix alias
  • Loading branch information
nemchik committed Aug 10, 2023
2 parents 7b9a463 + 85c21d5 commit 2191666
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 13 deletions.
6 changes: 3 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ pipeline {
PR_DOCKERHUB_IMAGE = 'lspipepr/kimai'
DIST_IMAGE = 'alpine'
MULTIARCH='true'
CI='true'
CI_WEB='true'
CI='false'
CI_WEB='false'
CI_PORT='80'
CI_SSL='false'
CI_DELAY='120'
CI_DOCKERENV='TZ=US/Pacific|TEST_RUN=1'
CI_DOCKERENV='TZ=US/Pacific'
CI_AUTH='user:password'
CI_WEBPATH=''
}
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ Find us at:
[![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)
[![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)
[![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/)
[![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)

[Kimai](https://kimai.org/) is a professional grade time-tracking application, free and open-source.
It handles use-cases of freelancers as well as companies with dozens or hundreds of users.
Expand Down
6 changes: 3 additions & 3 deletions jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ repo_vars:
- PR_DOCKERHUB_IMAGE = 'lspipepr/kimai'
- DIST_IMAGE = 'alpine'
- MULTIARCH='true'
- CI='true'
- CI_WEB='true'
- CI='false'
- CI_WEB='false'
- CI_PORT='80'
- CI_SSL='false'
- CI_DELAY='120'
- CI_DOCKERENV='TZ=US/Pacific|TEST_RUN=1'
- CI_DOCKERENV='TZ=US/Pacific'
- CI_AUTH='user:password'
- CI_WEBPATH=''
sponsor_links:
Expand Down
5 changes: 0 additions & 5 deletions root/etc/s6-overlay/s6-rc.d/init-kimai-config/run
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=bash

# Echo init finish for test runs
if [ -n "${TEST_RUN}" ]; then
echo '[ls.io-init] done.'
fi

DB_VALID=$(php -r 'echo filter_var(getenv("DATABASE_URL"), FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED);')

if [[ ${DATABASE_URL+x} == "" ]] || [[ ${DB_VALID+x} == "NULL" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion root/usr/bin/console
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=bash

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

0 comments on commit 2191666

Please sign in to comment.