[pull] master from root-gg:master

.dockerignore

@@ -10,4 +10,4 @@ webapp/dist
 **/plik.crt
 **/plik.key
 **/files
-.idea
+.idea

.github/workflows/master.yaml

@@ -0,0 +1,32 @@
+name: build
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:  
+  test:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'root-gg' }}
+    steps:
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v3
+
+    - name: Fetch tags
+      run: |
+        git fetch --prune --unshallow --tags
+
+    - name: Login to Docker Hub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Run
+      run: make release-and-push-to-docker-hub

.github/workflows/release.yaml

@@ -1,30 +1,43 @@
-name: go_build
+name: release
 
 on:
+  workflow_dispatch:
   release:
     types: [created]
 
 jobs:
   build:
     name: build_to_release
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        goos: [linux, windows, darwin]
-        goarch: [amd64]
     steps:
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
+
+    - name: Fetch tags
+      run: |
+        git fetch --prune --unshallow --tags
 
-    - name: Get the version
-      id: get_version
-      run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+    - name: Login to Docker Hub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Branch name
+      id: branch_name
+      run: |
+        echo ::set-output name=SOURCE_NAME::${GITHUB_REF#refs/*/}
+        echo ::set-output name=SOURCE_BRANCH::${GITHUB_REF#refs/heads/}
+        echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
+
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Make plik release
+      run: make release-and-push-to-docker-hub
 
-    - name: Build plik
-      uses: wangyoucao577/go-release-action@master
+    - name: Upload artifacts to release
+      uses: softprops/action-gh-release@v1
       with:
-        project_path: server
-        github_token: ${{ secrets.GITHUBTOKEN }}
-        goos: ${{ matrix.goos }}
-        goarch: ${{ matrix.goarch }}
-        binary_name: "plik"
+        files: releases/*

.github/workflows/tests.yaml

@@ -0,0 +1,31 @@
+name: test
+
+on: [push, pull_request]
+
+jobs:  
+  test:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v3
+
+    - name: Fetch tags
+      run: |
+        git fetch --prune --unshallow --tags
+
+    - name: Run linter
+      run: make lint
+
+    - name: Run tests
+      run: make test
+
+    - name: Run test-backends
+      run: make test-backends
+
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Run release
+      run: make release

Dockerfile

@@ -1,20 +1,17 @@
 ##################################################################################
-FROM node:12.15-alpine AS plik-frontend-builder
+FROM --platform=$BUILDPLATFORM node:20-alpine AS plik-frontend-builder
 
 # Install needed binaries
 RUN apk add --no-cache git make bash
 
 # Add the source code
-ADD Makefile .
-ADD webapp /webapp
-
-##################################################################################
-FROM plik-frontend-builder AS plik-frontend
+COPY Makefile .
+COPY webapp /webapp
 
 RUN make clean-frontend frontend
 
 ##################################################################################
-FROM golang:1.15.3-buster AS plik-builder
+FROM --platform=$BUILDPLATFORM golang:1-bullseye AS plik-builder
 
 # Install needed binaries
 RUN apt-get update && apt-get install -y build-essential crossbuild-essential-armhf crossbuild-essential-armel crossbuild-essential-arm64 crossbuild-essential-i386
@@ -23,33 +20,38 @@ RUN apt-get update && apt-get install -y build-essential crossbuild-essential-ar
 RUN mkdir -p /go/src/github.com/root-gg/plik
 WORKDIR /go/src/github.com/root-gg/plik
 
-# Add the source code ( see .dockerignore )
-ADD . .
-
 # Copy webapp build from previous stage
-COPY --from=plik-frontend /webapp/dist webapp/dist
-
-##################################################################################
-FROM plik-builder AS plik-releases
+COPY --from=plik-frontend-builder /webapp/dist webapp/dist
 
 ARG CLIENT_TARGETS=""
 ENV CLIENT_TARGETS=$CLIENT_TARGETS
 
-ARG TARGETS=""
-ENV TARGETS=$TARGETS
+ARG TARGETOS TARGETARCH TARGETVARIANT CC
+ENV TARGETOS=$TARGETOS
+ENV TARGETARCH=$TARGETARCH
+ENV TARGETVARIANT=$TARGETVARIANT
+ENV CC=$CC
+
+# Add the source code ( see .dockerignore )
+COPY . .
 
 RUN releaser/releaser.sh
 
 ##################################################################################
-FROM alpine:3.12 AS plik-base
+FROM scratch AS plik-release-archive
+
+COPY --from=plik-builder --chown=1000:1000 /go/src/github.com/root-gg/plik/plik-*.tar.gz /
+
+##################################################################################
+FROM alpine:3.18 AS plik-image
 
 RUN apk add --no-cache ca-certificates
 
 # Create plik user
 ENV USER=plik
 ENV UID=1000
 
-# See https://stackoverflow.com/a/55757473/12429735RUN
+# See https://stackoverflow.com/a/55757473/12429735
 RUN adduser \
     --disabled-password \
     --gecos "" \
@@ -58,27 +60,9 @@ RUN adduser \
     --uid "${UID}" \
     "${USER}"
 
+COPY --from=plik-builder --chown=1000:1000 /go/src/github.com/root-gg/plik/release /home/plik/
+
 EXPOSE 8080
 USER plik
 WORKDIR /home/plik/server
 CMD ./plikd
-
-##################################################################################
-FROM plik-base AS plik-amd64
-
-COPY --from=plik-releases --chown=1000:1000 /go/src/github.com/root-gg/plik/releases/plik-*-linux-amd64 /home/plik/
-
-##################################################################################
-FROM plik-base AS plik-386
-
-COPY --from=plik-releases --chown=1000:1000 /go/src/github.com/root-gg/plik/releases/plik-*-linux-386 /home/plik/
-
-##################################################################################
-FROM plik-base AS plik-arm
-
-COPY --from=plik-releases --chown=1000:1000 /go/src/github.com/root-gg/plik/releases/plik-*-linux-arm /home/plik/
-
-##################################################################################
-FROM plik-base AS plik-arm64
-
-COPY --from=plik-releases --chown=1000:1000 /go/src/github.com/root-gg/plik/releases/plik-*-linux-arm64 /home/plik/

Makefile

@@ -1,11 +1,13 @@
-SHELL = /bin/bash
+SHELL = bash
 
 BUILD_INFO = $(shell server/gen_build_info.sh base64)
 BUILD_FLAG = -ldflags="-X github.com/root-gg/plik/server/common.buildInfoString=$(BUILD_INFO) -w -s -extldflags=-static"
 BUILD_TAGS = -tags osusergo,netgo,sqlite_omit_load_extension
 
 GO_BUILD = go build $(BUILD_FLAG) $(BUILD_TAGS)
-GO_TEST = GORACE="halt_on_error=1" go test $(BUILD_FLAG) $(BUILD_TAGS) -race -cover -p 1
+
+COVER_FILE = /tmp/plik.coverprofile
+GO_TEST = GORACE="halt_on_error=1" go test $(BUILD_FLAG) $(BUILD_TAGS) -race -cover -coverprofile=$(COVER_FILE) -p 1
 
 ifdef ENABLE_RACE_DETECTOR
 	GO_BUILD := GORACE="halt_on_error=1" $(GO_BUILD) -race
@@ -42,7 +44,7 @@ client:
 ###
 clients:
 	# Only build clients
-	@TARGETS="skip" releaser/releaser.sh
+	@MAKEFILE_TARGET="clients" releaser/releaser.sh
 
 ###
 # Display build info
@@ -60,45 +62,57 @@ version:
 # Run linters
 ###
 lint:
-	@FAIL=0 ;echo -n " - go fmt :" ; OUT=`gofmt -l . | grep -v ^vendor` ; \
-	if [[ -z "$$OUT" ]]; then echo " OK" ; else echo " FAIL"; echo "$$OUT"; FAIL=1 ; fi ;\
-	echo -n " - go vet :" ; OUT=`go vet ./...` ; \
+	@FAIL=0 ;echo -n " - go fmt :" ; OUT=`gofmt -l . 2>&1 | grep -v ^vendor` ; \
 	if [[ -z "$$OUT" ]]; then echo " OK" ; else echo " FAIL"; echo "$$OUT"; FAIL=1 ; fi ;\
-	echo -n " - go lint :" ; OUT=`golint ./... | grep -v ^vendor` ; \
+	echo -n " - go vet :" ; OUT=`go vet ./... 2>&1` ; \
 	if [[ -z "$$OUT" ]]; then echo " OK" ; else echo " FAIL"; echo "$$OUT"; FAIL=1 ; fi ;\
 	test $$FAIL -eq 0
 
 ###
 # Run fmt
 ###
 fmt:
-	@goimports -w -l -local "github.com/root-gg/plik" $(shell find . -type f -name '*.go' -not -path "./vendor/*")
+	@gofmt -w -s $(shell find . -type f -name '*.go' -not -path "./vendor/*" )
 
 ###
 # Run tests
 ###
 test:
-	@if curl -s 127.0.0.1:8080 > /dev/null ; then echo "Plik server probably already running" && exit 1 ; fi
+	@if curl -s 127.0.0.1:8080 > /dev/null ; then echo "Plik server probably already running" ; exit 1 ; fi
 	@$(GO_TEST) ./... 2>&1 | grep -v "no test files"; test $${PIPESTATUS[0]} -eq 0
 	@echo "cli client integration tests :" && cd client && ./test.sh
 
+###
+# Open last cover profile in web browser
+###
+cover:
+	@if [[ ! -f $(COVER_FILE) ]]; then echo "Please run \"make test\" first to generate a cover profile" ; exit 1; fi
+	@go tool cover -html=$(COVER_FILE)
+	@echo "Check your web browser to see the cover profile"
+
 ###
 # Run integration tests for all available backends
 ###
 test-backends:
 	@testing/test_backends.sh
 
 ###
-# release
+# Build a docker image locally
+###
+docker:
+	@docker buildx build --progress=plain --load -t rootgg/plik:dev .
+
+###
+# Create release archives
 ###
 release:
 	@releaser/release.sh
 
 ###
-# docker
+# Create release archives, build a multiarch Docker image and push to Docker Hub
 ###
-docker:
-	@docker build -t rootgg/plik:dev --build-arg "TARGETS=amd64" --target="plik-amd64" .
+release-and-push-to-docker-hub:
+	@PUSH_TO_DOCKER_HUB=true releaser/release.sh
 
 ###
 # Remove server build files