Skip to content

Commit

Permalink
Workaround logger device /dev/log
Browse files Browse the repository at this point in the history
  • Loading branch information
Berry by Tiana Rakoto committed Nov 16, 2019
1 parent 2ce3cc3 commit 5e17be7
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .env
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
url = https://github.com/b23prodtm/TravisCI-OSX-PHP.git
[submodule "balena-sound"]
path = balena-sound
url = https://github.com/b23prodtm/balena-sound.git
url = https://github.com/balena-io-projects/balena-sound.git
6 changes: 1 addition & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,11 @@ RUN echo "127.0.0.1 ${SERVER_NAME}" >> /etc/hosts
# Add site conf to available domains, disable default instance
RUN a2ensite ${SERVER_NAME} && a2dissite 000-default

# Messages log
RUN apt-get install -yqq --no-install-recommends \
util-linux \
&& mkdir -p /run/systemd/journal/ && touch /run/systemd/journal/dev-log && ln -s /run/systemd/journal/dev-log /dev/log

# set architecture
RUN ./configure-docker-arch.sh ${DKR_ARCH}

# Install all PHP dependencies
RUN logger() { echo "LOGGER: $@"; } && export -f logger
RUN ./configure.sh --openshift -c -h -p pass -s word -d --docker -i -p=${MYSQL_ROOT_PASSWORD} -t=${MYSQL_PASSWORD} -Y

# Password Hash Verbose
Expand Down
1 change: 1 addition & 0 deletions balena-sound
Submodule balena-sound added at 74ffce
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ services:
build:
context: .
args:
- DKR_ARCH=x86_64
- BALENA_MACHINE_NAME=intel-nuc
- DKR_ARCH=armhf
- BALENA_MACHINE_NAME=raspberrypi3
- PHP_TAG=7.2-apache
- PHP_OWNER=amd64
- DB_TAG=amd64-latest
- PHP_OWNER=arm32v7
- DB_TAG=arm32v7-latest
volumes:
- data:/var/www/html
ports:
Expand All @@ -31,7 +31,7 @@ services:
# v3.4 compose file
#start_period: 40s
db:
image: betothreeprod/cci-mariadb:amd64-latest
image: betothreeprod/cci-mariadb:arm32v7-latest
volumes:
- db-data:/config
ports:
Expand Down

0 comments on commit 5e17be7

Please sign in to comment.