First Commit

Author: alexander-tebiev

.github/workflows/main.yml

@@ -26,7 +26,7 @@ jobs:
         name: Prepare env variables
         run: |
           echo "BUILD_DATE=$(TZ=':UTC' date +'%Y-%m-%d %H:%M:%S (%Z)')" >> ${GITHUB_ENV}
-          echo "BUILD_VER=${GITHUB_SHA::7}" >> ${GITHUB_ENV}
+          echo "BUILD_FINGERPRINT=${GITHUB_SHA::7}" >> ${GITHUB_ENV}
 
       -
         name: Check out code
@@ -62,10 +62,10 @@ jobs:
           file: ./docker/Dockerfile
           build-args: |
             BUILD_DATE=${{ env.BUILD_DATE }}
-            BUILD_VER=${{ env.BUILD_VER }}
+            BUILD_FINGERPRINT=${{ env.BUILD_FINGERPRINT }}
           tags: |
             legacyphp/gearman-ui:latest
-            ghcr.io/phplegacy/gearman-ui:latest
+            ghcr.io/phplegacy/gearman-ui-docker:latest
           pull: true
           push: true
 

Makefile

@@ -25,6 +25,3 @@ logs: ## Show docker logs
 
 gearman-ui:
 	docker-compose exec gearman-ui sh
-
-gearman:
-	docker-compose exec gearman sh

README.md

@@ -1,6 +1,36 @@
-# https://github.com/phplegacy/gearman-ui-docker/
+# Gearman UI Docker image
 
+<p align="center"><a href="https://github.com/phplegacy/gearman-ui-docker"><img src="https://github.com/phplegacy/gearman-ui-docker/raw/master/docs/gearman-ui.png"></a></p>
 
 
+Docker image for [Gearman UI](https://github.com/phplegacy/gearman-ui), a small PHP application providing a minimal monitoring dashboard for a cluster of Gearman Job Servers.
 
-GEARMAN_SERVERS =  'Gearman#1:gearman:4730,Gearman#2:gearman2:4730';
+## Docker repository
+[Docker Hub](https://hub.docker.com/r/legacyphp/gearman-ui)  
+`docker pull legacyphp/gearman-ui:latest`
+
+[GitHub Packages](https://github.com/phplegacy/gearman-ui-docker/pkgs/container/gearman-ui-docker)  
+`docker pull ghcr.io/phplegacy/gearman-ui-docker:latest`
+
+## Usage
+
+Use provided [`docker-compose.yml`](https://github.com/phplegacy/gearman-ui-docker/blob/master/docker-compose.yml) as an example.
+
+## Configuration
+
+Use environment variables to define gearman server name, address and port:  
+```
+GEARMAN_SERVERS = 'Gearman#1:gearman:4730';
+```
+
+Separate configuration with comma in order to connect to multiple gearman servers:
+```
+GEARMAN_SERVERS = 'Gearman#1:gearman:4730,Gearman#2:gearman2:4730';
+```
+
+## License
+
+The MIT License (MIT). Please see [License File](https://github.com/phplegacy/gearman-ui-docker/blob/master/LICENSE) for more information.
+
+---
+If you like this project, please consider giving me a ⭐

docker-compose.yml

@@ -10,8 +10,7 @@ services:
     restart: unless-stopped
     environment:
       - 'TZ=UTC'
-      - 'GEARMAN_SERVERS=Gearman#1:gearman:4730,Gearman#2:gearman2:4730'
-      - 'COMPOSE_CONVERT_WINDOWS_PATHS=1'
+      - 'GEARMAN_SERVERS=Gearman#1:gearman:4730'
     networks:
       - network1
 

docker/Dockerfile

@@ -3,6 +3,7 @@ FROM node:4-alpine as node
 
 WORKDIR /tmp/
 ENV NODE_ENV=production
+ENV NPM_CONFIG_UNSAFE_PERM=true
 
 
 # Core utilites install
@@ -21,7 +22,6 @@ RUN set -eux \
 
 
 FROM php:5.6-fpm-alpine as php
-LABEL org.opencontainers.image.source=https://github.com/phplegacy/gearman-ui-docker
 
 ENV TERM="xterm-256color" \
 LANGUAGE="en_US.UTF-8" \
@@ -81,13 +81,23 @@ ENV PATH ${PATH}:${HOME}/.composer/vendor/bin:/app/vendor/bin/
 
 ENV COMPOSER_ALLOW_SUPERUSER=1
 
+LABEL org.opencontainers.image.title="Gearman UI Docker image" \
+    org.opencontainers.image.description="phplegacy Gearman UI Docker image" \
+    org.opencontainers.image.authors="https://github.com/phplegacy/gearman-ui-docker" \
+    org.opencontainers.image.documentation="https://github.com/phplegacy/gearman-ui-docker" \
+    org.opencontainers.image.url="https://github.com/phplegacy/gearman-ui-docker" \
+    org.opencontainers.image.source="https://github.com/phplegacy/gearman-ui-docker"
+
 ARG TZ='UTC'
 ENV TZ=$TZ
+
 #These params meant to be set by CI
 ARG BUILD_DATE
 ENV BUILD_DATE=$BUILD_DATE
-ARG BUILD_VER
-ENV BUILD_VER=$BUILD_VER
+RUN echo $BUILD_DATE
+ARG BUILD_FINGERPRINT
+ENV BUILD_FINGERPRINT=$BUILD_FINGERPRINT
+RUN echo $BUILD_FINGERPRINT
 
 COPY --from=node /tmp/gearman-ui-master/ /app/
 COPY ./docker/config/gearmanui/config.yml /app/config.yml

docker/etc/docker-entrypoint.sh

@@ -13,7 +13,7 @@ export NUM_CPUS=`nproc`
 for f in /docker-entrypoint.init.d/*; do
     case "$f" in
         *.sh) # this should match the set of files we check for below
-            echo "⚙	 Executing entrypoint.init file: ${f}"
+            echo "	 ⚙	 Executing entrypoint.init file: ${f}"
             . $f
             break
             ;;
@@ -23,9 +23,9 @@ done
 if [ "$1" = 'supervisor' ]; then
     EXEC="/usr/bin/supervisord -c /etc/supervisord.conf"
 
-    printf "\n${GRN}--->${NC} 🚀️️	 Starting ${GRN}Gearman UI${NC} container..."
-    printf "\n${GRN}--->${NC} Build date: ${GRN}${BUILD_DATE}${NC}, Build version: ${GRN}${BUILD_VER}${NC}"
-    printf "\n${GRN}--->${NC} Exec command: ${EXEC}\n\n"
+    printf "\n${GRN}--->${NC} 	🚀️️	 Welcome to ${GRN}phplegacy Gearman UI${NC} container..."
+    printf "\n${GRN}--->${NC} Docker image build date: ${GRN}${BUILD_DATE}${NC}, fingerprint: ${GRN}${BUILD_FINGERPRINT}${NC}"
+    printf "\n${GRN}--->${NC} Subscribe to project updates: ${GRN}https://github.com/phplegacy/gearman-ui-docker${NC}\n\n"
 
     exec ${EXEC}
 fi