- [github](.github/workflows/testimage.yml) Now use GitHub Actions to test image.

- [demo](demo/Makefile) Now depend on the docker-compose-plugin.
- [demo](demo/Makefile) Fix the broken `-diff` target.

Author: mlan

.github/workflows/testimage.yml

@@ -0,0 +1,21 @@
+name: Docker Image Makefile CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Build docker images
+      run: make build-all
+
+    - name: Run tests
+      shell: 'script -q -e -c "bash {0}"'
+      run: |
+        make test-all

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.0.5
+
+- [github](.github/workflows/testimage.yml) Now use GitHub Actions to test image.
+- [demo](demo/Makefile) Now depend on the docker-compose-plugin.
+- [demo](demo/Makefile) Fix the broken `-diff` target.
+
 # 1.0.4
 
 - [test](test) Move all tests to separate folder.

README.md

@@ -1,6 +1,6 @@
 # The `mlan/gitweb` repository
 
-![travis-ci test](https://img.shields.io/travis/mlan/docker-gitweb.svg?label=build&style=flat-square&logo=travis)
+![github action ci](https://img.shields.io/github/actions/workflow/status/mlan/docker-gitweb/testimage.yml?label=build&style=flat-square&logo=github)
 ![docker version](https://img.shields.io/docker/v/mlan/gitweb?label=version&style=flat-square&logo=docker)
 ![image size](https://img.shields.io/docker/image-size/mlan/gitweb/latest.svg?label=size&style=flat-square&logo=docker)
 ![docker pulls](https://img.shields.io/docker/pulls/mlan/gitweb.svg?label=pulls&style=flat-square&logo=docker)

demo/Makefile

@@ -5,7 +5,7 @@ _ip       = $(shell docker inspect -f \
 	$(1) | head -n1)
 
 SRV_NAME ?= repo-gui
-CNT_NAME ?= $(COMPOSE_PROJECT_NAME)_$(SRV_NAME)_1
+CNT_NAME ?= $(COMPOSE_PROJECT_NAME)-$(SRV_NAME)-1
 CNT_BIND ?= 127.0.0.1:8080
 CNT_SHEL ?= sh
 TST_WEBB ?= firefox
@@ -16,25 +16,25 @@ variables:
 init: up
 
 ps:
-	docker-compose ps
+	docker compose ps
 
 up:
-	docker-compose up -d
+	docker compose up -d
 
 start:
-	docker-compose start
+	docker compose start
 
 stop:
-	docker-compose stop
+	docker compose stop
 
 down:
-	docker-compose down
+	docker compose down
 
 destroy:
-	docker-compose down -v
+	docker compose down -v
 
 config:
-	docker-compose config
+	docker compose config
 
 wait_%:
 	sleep 10
@@ -46,10 +46,10 @@ log:
 	docker container logs $(CNT_NAME)
 
 logs:
-	docker-compose logs --tail 10
+	docker compose logs --tail 10
 
 sh:
-	docker-compose exec $(SRV_NAME) $(CNT_SHEL)
+	docker compose exec $(SRV_NAME) $(CNT_SHEL)
 
 diff:
 	docker container diff $(CNT_NAME)
@@ -58,24 +58,24 @@ top:
 	docker container top $(CNT_NAME)
 
 env:
-	docker-compose exec $(SRV_NAME) env
+	docker compose exec $(SRV_NAME) env
 
 htop: tools_install
-	docker-compose exec $(SRV_NAME) htop
+	docker compose exec $(SRV_NAME) htop
 
 ipcs:
-	docker-compose exec $(SRV_NAME) ipcs
+	docker compose exec $(SRV_NAME) ipcs
 
 apk_list:
-	docker-compose exec $(SRV_NAME) /bin/sh -c 'for pkg in $$(apk info 2>/dev/null); do printf "%9s  %s\n" $$(apk info -s $$pkg 2>/dev/null | sed -n "2{p;q}") $$pkg; done | sort'
+	docker compose exec $(SRV_NAME) /bin/sh -c 'for pkg in $$(apk info 2>/dev/null); do printf "%9s  %s\n" $$(apk info -s $$pkg 2>/dev/null | sed -n "2{p;q}") $$pkg; done | sort'
 
 apk_add_%:
-	docker-compose exec $(SRV_NAME) apk -q --no-cache --update add $*
+	docker compose exec $(SRV_NAME) apk -q --no-cache --update add $*
 
 tools_install:
-	docker-compose exec $(SRV_NAME) apk --no-cache --update add \
+	docker compose exec $(SRV_NAME) apk --no-cache --update add \
 	nano lsof htop openldap-clients bind-tools iputils strace util-linux
 
 theme_kogakure:
-	docker-compose exec $(SRV_NAME) sh -c 'git clone https://github.com/kogakure/gitweb-theme.git /tmp/gitweb-theme && apk --no-cache --update add bash && cd /tmp/gitweb-theme && ./setup --install'
+	docker compose exec $(SRV_NAME) sh -c 'git clone https://github.com/kogakure/gitweb-theme.git /tmp/gitweb-theme && apk --no-cache --update add bash && cd /tmp/gitweb-theme && ./setup --install'
 

dkr.mk

@@ -6,7 +6,7 @@
 #
 # $(call dkr_srv_cnt,app) -> d03dda046e0b90c...
 #
-dkr_srv_cnt = $(shell docker-compose ps -q $(1) | head -n1)
+dkr_srv_cnt = $(shell docker compose ps -q $(1) | head -n1)
 #
 # $(call dkr_cnt_ip,demo-app-1) -> 172.28.0.3
 #
@@ -18,7 +18,7 @@ dkr_cnt_ip   = $(shell docker inspect -f \
 #
 dkr_srv_ip   = $(shell docker inspect -f \
 	'{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' \
-	$$(docker-compose ps -q $(1)) | head -n1)
+	$$(docker compose ps -q $(1)) | head -n1)
 #
 # $(call dkr_cnt_pid,demo-app-1) -> 9755
 #