better startup scripts

images/build.sh

@@ -1,7 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
+export DOCKER_BUILDKIT=1
+
 versions=("7.3" "7.4" "8.0" "8.1")
 
 for version in "${versions[@]}"; do

images/haze/Dockerfile

@@ -20,8 +20,8 @@ RUN DEBIAN_FRONTEND=noninteractive ;\
     gdb \
     python3-pip \
     procps \
-        ncat \
-        chromium && \
+#   chromium \
+  ncat && \
   curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.1.35.zip" -o "awscliv2.zip" && \
   unzip awscliv2.zip && \
   ./aws/install && \

images/haze/misc/bootstrap.sh

@@ -67,9 +67,11 @@ fi
 
 if [ -n "$BLACKFIRE_SERVER_ID" ]
 then
+  sh -c '
     yes | blackfire agent:config --server-id=$BLACKFIRE_SERVER_ID --server-token=$BLACKFIRE_SERVER_TOKEN
     mkdir /var/run/blackfire/
     BLACKFIRE_LOG_LEVEL=4 BLACKFIRE_LOG_FILE=/var/log/agent.log blackfire agent &
+  '&
 fi
 
 crontab /etc/oc-cron.conf

images/php/bootstrap-nginx.sh

@@ -8,12 +8,20 @@ tail --follow --retry /var/log/nginx/*.log &
 UID=${UID:-1000}
 GID=${GID:-1000}
 
+if [ $(getent group $GID) ]; then
+  groupadd haze
+  EXTRA_GROUP=" -G haze"
+else
   groupadd -g $GID haze
-useradd -m -u $UID -g $GID haze
-chown -R haze:haze /home/haze
+  EXTRA_GROUP=""
+fi
+useradd -u $UID -g $GID $EXTRA_GROUP haze
+chown -R haze:$GID /home/haze
 
+if [ -f "/var/run/docker.sock" ]; then
   groupadd docker -g $(stat --format "%g" /var/run/docker.sock)
   usermod -a -G docker haze
+fi
 
 /usr/local/sbin/php-fpm &
-/etc/init.d/nginx start
+nginx

images/push.sh

@@ -1,8 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
 versions=("7.3" "7.4" "8.0" "8.1" "7.3-dbg" "7.4-dbg" "8.0-dbg" "8.1-dbg")
+versions=("7.4")
 
 for version in "${versions[@]}"; do
   docker push "icewind1991/haze-php:$version"